mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
salt/modules/systemd.py: Use systemd-run --scope where needed
This commit is contained in:
Erik Johnson
parent
22919a25bc
commit
e2d9e87e10
1 changed files with 141 additions and 23 deletions
|
|
@ -235,12 +235,17 @@ def _runlevel():
|
|||
return ret
|
||||
|
||||
|
||||
def _systemctl_cmd(action, name=None):
|
||||
def _systemctl_cmd(action, name=None, systemd_scope=False):
|
||||
'''
|
||||
Build a systemctl command line. Treat unit names without one
|
||||
of the valid suffixes as a service.
|
||||
'''
|
||||
ret = ['systemctl']
|
||||
ret = []
|
||||
if systemd_scope \
|
||||
and salt.utils.systemd.has_scope(__context__) \
|
||||
and __salt__['config.get']('systemd.scope', True):
|
||||
ret.extend(['systemd-run', '--scope'])
|
||||
ret.append('systemctl')
|
||||
if isinstance(action, six.string_types):
|
||||
action = shlex.split(action)
|
||||
ret.extend(action)
|
||||
|
|
@ -503,6 +508,16 @@ def missing(name):
|
|||
def unmask(name):
|
||||
'''
|
||||
.. versionadded:: 2015.5.0
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Unmask the specified service with systemd
|
||||
|
||||
|
|
@ -519,7 +534,7 @@ def unmask(name):
|
|||
return True
|
||||
|
||||
cmd = 'unmask --runtime' if 'runtime' in mask_status else 'unmask'
|
||||
out = __salt__['cmd.run_all'](_systemctl_cmd(cmd, name),
|
||||
out = __salt__['cmd.run_all'](_systemctl_cmd(cmd, name, systemd_scope=True),
|
||||
python_shell=False,
|
||||
redirect_stderr=True)
|
||||
|
||||
|
|
@ -532,6 +547,16 @@ def unmask(name):
|
|||
def mask(name, runtime=False):
|
||||
'''
|
||||
.. versionadded:: 2015.5.0
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Mask the specified service with systemd
|
||||
|
||||
|
|
@ -549,7 +574,7 @@ def mask(name, runtime=False):
|
|||
_check_for_unit_changes(name)
|
||||
|
||||
cmd = 'mask --runtime' if runtime else 'mask'
|
||||
out = __salt__['cmd.run_all'](_systemctl_cmd(cmd, name),
|
||||
out = __salt__['cmd.run_all'](_systemctl_cmd(cmd, name, systemd_scope=True),
|
||||
python_shell=False,
|
||||
redirect_stderr=True)
|
||||
|
||||
|
|
@ -588,6 +613,17 @@ def masked(name):
|
|||
|
||||
def start(name):
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Start the specified service with systemd
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -599,11 +635,24 @@ def start(name):
|
|||
if _untracked_custom_unit_found(name) or _unit_file_changed(name):
|
||||
systemctl_reload()
|
||||
unmask(name)
|
||||
return not __salt__['cmd.retcode'](_systemctl_cmd('start', name))
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('start', name, systemd_scope=True),
|
||||
python_shell=False) == 0
|
||||
|
||||
|
||||
def stop(name):
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Stop the specified service with systemd
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -613,12 +662,24 @@ def stop(name):
|
|||
salt '*' service.stop <service name>
|
||||
'''
|
||||
_check_for_unit_changes(name)
|
||||
return __salt__['cmd.retcode'](_systemctl_cmd('stop', name),
|
||||
python_shell=False) == 0
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('stop', name, systemd_scope=True),
|
||||
python_shell=False) == 0
|
||||
|
||||
|
||||
def restart(name):
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Restart the specified service with systemd
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -629,12 +690,24 @@ def restart(name):
|
|||
'''
|
||||
_check_for_unit_changes(name)
|
||||
unmask(name)
|
||||
return __salt__['cmd.retcode'](_systemctl_cmd('restart', name),
|
||||
python_shell=False) == 0
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('restart', name, systemd_scope=True),
|
||||
python_shell=False) == 0
|
||||
|
||||
|
||||
def reload_(name):
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Reload the specified service with systemd
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -645,12 +718,24 @@ def reload_(name):
|
|||
'''
|
||||
_check_for_unit_changes(name)
|
||||
unmask(name)
|
||||
return __salt__['cmd.retcode'](_systemctl_cmd('reload', name),
|
||||
python_shell=False) == 0
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('reload', name, systemd_scope=True),
|
||||
python_shell=False) == 0
|
||||
|
||||
|
||||
def force_reload(name):
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
.. versionadded:: 0.12.0
|
||||
|
||||
Force-reload the specified service with systemd
|
||||
|
|
@ -663,8 +748,9 @@ def force_reload(name):
|
|||
'''
|
||||
_check_for_unit_changes(name)
|
||||
unmask(name)
|
||||
return __salt__['cmd.retcode'](_systemctl_cmd('force-reload', name),
|
||||
python_shell=False) == 0
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('force-reload', name, systemd_scope=True),
|
||||
python_shell=False) == 0
|
||||
|
||||
|
||||
# The unused sig argument is required to maintain consistency with the API
|
||||
|
|
@ -690,6 +776,17 @@ def status(name, sig=None): # pylint: disable=unused-argument
|
|||
# established by Salt's service management states.
|
||||
def enable(name, **kwargs): # pylint: disable=unused-argument
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Enable the named service to start when the system boots
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -701,23 +798,39 @@ def enable(name, **kwargs): # pylint: disable=unused-argument
|
|||
_check_for_unit_changes(name)
|
||||
unmask(name)
|
||||
if name in _get_sysv_services():
|
||||
cmd = []
|
||||
if salt.utils.systemd.has_scope(__context__) \
|
||||
and __salt__['config.get']('systemd.scope', True):
|
||||
cmd.extend(['systemd-run', '--scope'])
|
||||
service_exec = _get_service_exec()
|
||||
if service_exec.endswith('/update-rc.d'):
|
||||
cmd = [service_exec, '-f', name, 'defaults', '99']
|
||||
cmd.extend([service_exec, '-f', name, 'defaults', '99'])
|
||||
elif service_exec.endswith('/chkconfig'):
|
||||
cmd = [service_exec, name, 'on']
|
||||
cmd.extend([service_exec, name, 'on'])
|
||||
return __salt__['cmd.retcode'](cmd,
|
||||
python_shell=False,
|
||||
ignore_retcode=True) == 0
|
||||
return __salt__['cmd.retcode'](_systemctl_cmd('enable', name),
|
||||
python_shell=False,
|
||||
ignore_retcode=True) == 0
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('enable', name, systemd_scope=True),
|
||||
python_shell=False,
|
||||
ignore_retcode=True) == 0
|
||||
|
||||
|
||||
# The unused kwargs argument is required to maintain consistency with the API
|
||||
# established by Salt's service management states.
|
||||
def disable(name, **kwargs): # pylint: disable=unused-argument
|
||||
'''
|
||||
.. versionchanged:: 2015.8.12,2016.3.3,Carbon
|
||||
On minions running systemd>=205, `systemd-run(1)`_ is now used to
|
||||
isolate commands run by this function from the ``salt-minion`` daemon's
|
||||
control group. This is done to avoid a race condition in cases where
|
||||
the ``salt-minion`` service is restarted while a service is being
|
||||
modified. If desired, usage of `systemd-run(1)`_ can be suppressed by
|
||||
setting a :mod:`config option <salt.modules.config.get>` called
|
||||
``systemd.scope``, with a value of ``False`` (no quotes).
|
||||
|
||||
.. _`systemd-run(1)`: https://www.freedesktop.org/software/systemd/man/systemd-run.html
|
||||
|
||||
Disable the named service to not start when the system boots
|
||||
|
||||
CLI Example:
|
||||
|
|
@ -728,17 +841,22 @@ def disable(name, **kwargs): # pylint: disable=unused-argument
|
|||
'''
|
||||
_check_for_unit_changes(name)
|
||||
if name in _get_sysv_services():
|
||||
cmd = []
|
||||
if salt.utils.systemd.has_scope(__context__) \
|
||||
and __salt__['config.get']('systemd.scope', True):
|
||||
cmd.extend(['systemd-run', '--scope'])
|
||||
service_exec = _get_service_exec()
|
||||
if service_exec.endswith('/update-rc.d'):
|
||||
cmd = [service_exec, '-f', name, 'remove']
|
||||
cmd.extend([service_exec, '-f', name, 'remove'])
|
||||
elif service_exec.endswith('/chkconfig'):
|
||||
cmd = [service_exec, name, 'off']
|
||||
cmd.extend([service_exec, name, 'off'])
|
||||
return __salt__['cmd.retcode'](cmd,
|
||||
python_shell=False,
|
||||
ignore_retcode=True) == 0
|
||||
return __salt__['cmd.retcode'](_systemctl_cmd('disable', name),
|
||||
python_shell=False,
|
||||
ignore_retcode=True) == 0
|
||||
return __salt__['cmd.retcode'](
|
||||
_systemctl_cmd('disable', name, systemd_scope=True),
|
||||
python_shell=False,
|
||||
ignore_recode=True) == 0
|
||||
|
||||
|
||||
# The unused kwargs argument is required to maintain consistency with the API
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue