valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10188 from nshalman/smartos-cron-fix

Browse Source 
Fix cron state to work on SmartOS
This commit is contained in:
Thomas S Hatch 2014-02-04 16:16:09 -08:00
commit a85838b4ff
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/cron.py
View File

@ -64,7 +64,7 @@ def _get_cron_cmdstr(user, path):
Returns a platform-specific format string, to be used to build a crontab
command.
'''
if __grains__['os'] == 'Solaris':
if __grains__['os_family'] == 'Solaris':
return 'su - {0} -c "crontab {1}"'.format(user, path)
else:
return 'crontab -u {0} {1}'.format(user, path)
@ -103,7 +103,7 @@ def _write_cron_lines(user, lines):
path = salt.utils.mkstemp()
with salt.utils.fopen(path, 'w+') as fp_:
fp_.writelines(lines)
if __grains__['os'] == 'Solaris' and user != "root":
if __grains__['os_family'] == 'Solaris' and user != "root":
__salt__['cmd.run']('chown {0} {1}'.format(user, path))
ret = __salt__['cmd.run_all'](_get_cron_cmdstr(user, path))
os.remove(path)
@ -130,7 +130,7 @@ def raw_cron(user):
salt '*' cron.raw_cron root
'''
if __grains__['os'] == 'Solaris':
if __grains__['os_family'] == 'Solaris':
cmd = 'crontab -l {0}'.format(user)
else:
cmd = 'crontab -l -u {0}'.format(user)

6
salt/modules/incron.py
View File

@ -60,7 +60,7 @@ def _get_incron_cmdstr(user, path):
Returns a platform-specific format string, to be used to build a incrontab
command.
'''
if __grains__['os'] == 'Solaris':
if __grains__['os_family'] == 'Solaris':
return 'su - {0} -c "incrontab {1}"'.format(user, path)
else:
return 'incrontab -u {0} {1}'.format(user, path)
@ -104,7 +104,7 @@ def _write_incron_lines(user, lines):
path = salt.utils.mkstemp()
with salt.utils.fopen(path, 'w+') as fp_:
fp_.writelines(lines)
if __grains__['os'] == 'Solaris' and user != "root":
if __grains__['os_family'] == 'Solaris' and user != "root":
__salt__['cmd.run']('chown {0} {1}'.format(user, path))
ret = __salt__['cmd.run_all'](_get_incron_cmdstr(user, path))
os.remove(path)
@ -164,7 +164,7 @@ def raw_incron(user):
salt '*' incron.raw_cron root
'''
if __grains__['os'] == 'Solaris':
if __grains__['os_family'] == 'Solaris':
cmd = 'incrontab -l {0}'.format(user)
else:
cmd = 'incrontab -l -u {0}'.format(user)

2
salt/states/cron.py
View File

@ -156,7 +156,7 @@ def _get_cron_info():
elif __grains__['os'] == 'OpenBSD':
group = 'crontab'
crontab_dir = '/var/cron/tabs'
elif __grains__['os'] == 'Solaris':
elif __grains__['os_family'] == 'Solaris':
group = 'root'
crontab_dir = '/var/spool/cron/crontabs'
elif __grains__['os'] == 'MacOS':

2
salt/states/incron.py
View File

@ -77,7 +77,7 @@ def _get_cron_info():
elif __grains__['os'] == 'OpenBSD':
group = 'crontab'
crontab_dir = '/var/spool/incron'
elif __grains__['os'] == 'Solaris':
elif __grains__['os_family'] == 'Solaris':
group = 'root'
crontab_dir = '/var/spool/incron'
else:

2
tests/unit/modules/cron_test.py
View File

@ -44,7 +44,7 @@ class PsTestCase(TestCase):
def test__get_cron_cmdstr_solaris(self):
cron.__grains__ = __grains__
with patch.dict(cron.__grains__, {'os': 'Solaris'}):
with patch.dict(cron.__grains__, {'os_family': 'Solaris'}):
self.assertEqual('su - root -c "crontab /tmp"',
cron._get_cron_cmdstr(STUB_USER, STUB_PATH))