saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #32230 from terminalmage/issue32169

Browse source 
systemd.py: Support both update-rc.d and chkconfig as managers of sysv services
This commit is contained in:
Nicole Thomas 2016-03-30 15:09:43 -06:00
commit 6216c37885
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
salt/modules/systemd.py
View file

@ -17,7 +17,7 @@ import shlex
# Import 3rd-party libs
import salt.utils.itertools
import salt.utils.systemd
from salt.exceptions import CommandExecutionError, CommandNotFoundError
from salt.exceptions import CommandExecutionError
from salt.ext import six
log = logging.getLogger(__name__)
@ -129,16 +129,6 @@ def _default_runlevel():
return runlevel
def _get_service_exec():
'''
Debian uses update-rc.d to manage System-V style services.
http://www.debian.org/doc/debian-policy/ch-opersys.html#s9.3.3
'''
executable = 'update-rc.d'
salt.utils.check_or_die(executable)
return executable
def _get_systemd_services():
'''
Use os.listdir() to get all the unit files
@ -200,16 +190,25 @@ def _get_sysv_services():
return ret
def _has_sysv_exec():
def _get_service_exec():
'''
Return the current runlevel
Returns the path to the sysv service manager (either update-rc.d or
chkconfig)
'''
contextkey = 'systemd._has_sysv_exec'
contextkey = 'systemd._get_service_exec'
if contextkey not in __context__:
try:
__context__[contextkey] = bool(_get_service_exec())
except (CommandExecutionError, CommandNotFoundError):
__context__[contextkey] = False
executables = ('update-rc.d', 'chkconfig')
for executable in executables:
service_exec = salt.utils.which(executable)
if service_exec is not None:
break
else:
raise CommandExecutionError(
'Unable to find sysv service manager (tried {0})'.format(
', '.join(executables)
)
)
__context__[contextkey] = service_exec
return __context__[contextkey]
@ -692,7 +691,11 @@ def enable(name, **kwargs): # pylint: disable=unused-argument
_check_for_unit_changes(name)
unmask(name)
if name in _get_sysv_services():
cmd = [_get_service_exec(), '-f', name, 'defaults', '99']
service_exec = _get_service_exec()
if service_exec.endswith('/update-rc.d'):
cmd = [service_exec, '-f', name, 'defaults', '99']
elif service_exec.endswith('/chkconfig'):
cmd = [service_exec, name, 'on']
return __salt__['cmd.retcode'](cmd,
python_shell=False,
ignore_retcode=True) == 0
@ -715,7 +718,11 @@ def disable(name, **kwargs): # pylint: disable=unused-argument
'''
_check_for_unit_changes(name)
if name in _get_sysv_services():
cmd = [_get_service_exec(), '-f', name, 'remove']
service_exec = _get_service_exec()
if service_exec.endswith('/update-rc.d'):
cmd = [service_exec, '-f', name, 'remove']
elif service_exec.endswith('/chkconfig'):
cmd = [service_exec, name, 'off']
return __salt__['cmd.retcode'](cmd,
python_shell=False,
ignore_retcode=True) == 0