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

Merge pull request #1908 from uggedal/develop

Browse Source 
Use `systemctl list-unit-files` for finding systemd units.
This commit is contained in:
Thomas S Hatch 2012-08-29 09:34:42 -07:00
commit 34aef57b6f
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
salt/modules/systemd.py
View File

@ -3,9 +3,12 @@ Provide the service module for systemd
'''
# Import Python libs
import os
import re
# Import Salt libs
import salt.utils
VALID_UNIT_TYPES = ['service','socket', 'device', 'mount', 'automount',
'swap', 'target', 'path', 'timer']
def __virtual__():
'''
@ -19,13 +22,33 @@ def __virtual__():
def _systemctl_cmd(action, name):
valid_suffixes = ['service','socket', 'device', 'mount', 'automount',
'swap', 'target', 'path', 'timer']
if not any(name.endswith(valid_suffix) for valid_suffix in valid_suffixes):
'''
Build a systemctl command line. Treat unit names without one
of the valid suffixes as a service.
'''
if not any(name.endswith(suffix) for suffix in VALID_UNIT_TYPES):
name += '.service'
return 'systemctl {0} {1}'.format(action, name)
def _get_all_unit_files():
'''
Get all unit files and their state. Unit files ending in .service
are normalized so that they can be referenced without a type suffix.
'''
rexp = re.compile('(?m)^(?P<name>.+)\.(?P<type>' +
'|'.join(VALID_UNIT_TYPES) +
')\s+(?P<state>.+)$')
out = __salt__['cmd.run_stdout']('systemctl --no-legend list-unit-files | col -b')
ret = {}
for match in rexp.finditer(out):
name = match.group('name')
if match.group('type') != 'service':
name += '.' + match.group('type')
ret[name] = match.group('state')
return ret
def get_enabled():
'''
@ -36,9 +59,9 @@ def get_enabled():
salt '*' service.get_enabled
'''
ret = []
for serv in get_all():
if not __salt__['cmd.retcode'](_systemctl_cmd('is-enabled', serv)):
ret.append(serv)
for name, state in enumerate(_get_all_unit_files()):
if state == 'enabled':
ret.append(name)
return sorted(ret)
@ -51,9 +74,9 @@ def get_disabled():
salt '*' service.get_disabled
'''
ret = []
for serv in get_all():
if __salt__['cmd.retcode'](_systemctl_cmd('is-enabled', serv)):
ret.append(serv)
for name, state in enumerate(_get_all_unit_files()):
if state == 'disabled':
ret.append(name)
return sorted(ret)
@ -65,13 +88,7 @@ def get_all():
salt '*' service.get_all
'''
ret = set()
for sdir in ('/lib/systemd/system', '/etc/systemd/system'):
if os.path.isdir(sdir):
for fn_ in os.listdir(sdir):
if fn_.endswith('.service'):
ret.add(fn_[:fn_.rindex('.')])
return sorted(list(ret))
return sorted(_get_all_unit_files().keys())
def start(name):