cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Several systemd fixes

Browse source 
Allow some operations on missing services
Better sysv handling
Rearranged error reporting
fixed load error catching and order logic
also minor doc/comment updates
added warnings
This commit is contained in:
Brian Coca 2016-11-09 13:51:26 -05:00 committed by Matt Clay
parent 7079fe41be
commit 44c07d7ca8
1 changed files with 59 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
lib/ansible/modules/system/systemd.py
View file

@ -72,14 +72,10 @@ requirements:
EXAMPLES = ''' EXAMPLES = '''
# Example action to start service httpd, if not running # Example action to start service httpd, if not running
- systemd: - systemd: state=started name=httpd
state: started
name: httpd
# Example action to stop service cron on debian, if running # Example action to stop service cron on debian, if running
- systemd: - systemd: name=cron state=stopped
name: cron
state: stopped
# Example action to restart service cron on centos, in all cases, also issue daemon-reload to pick up config changes # Example action to restart service cron on centos, in all cases, also issue daemon-reload to pick up config changes
- systemd: - systemd:
@ -235,16 +231,15 @@ status:
} }
''' '''
import os
import glob
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_bytes, to_native from ansible.module_utils.service import sysv_exists, sysv_is_enabled, fail_if_missing
from ansible.module_utils._text import to_native
# =========================================== # ===========================================
# Main control flow # Main control flow
def main(): def main():
# init # initialize
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
name = dict(required=True, type='str', aliases=['unit', 'service']), name = dict(required=True, type='str', aliases=['unit', 'service']),
@ -258,7 +253,6 @@ def main():
required_one_of=[['state', 'enabled', 'masked', 'daemon_reload']], required_one_of=[['state', 'enabled', 'masked', 'daemon_reload']],
) )
# initialize
systemctl = module.get_bin_path('systemctl') systemctl = module.get_bin_path('systemctl')
if module.params['user']: if module.params['user']:
systemctl = systemctl + " --user" systemctl = systemctl + " --user"
@ -269,6 +263,7 @@ def main():
'name': unit, 'name': unit,
'changed': False, 'changed': False,
'status': {}, 'status': {},
'warnings': [],
} }
# Run daemon-reload first, if requested # Run daemon-reload first, if requested
@ -277,44 +272,55 @@ def main():
if rc != 0: if rc != 0:
module.fail_json(msg='failure %d during daemon-reload: %s' % (rc, err)) module.fail_json(msg='failure %d during daemon-reload: %s' % (rc, err))
#TODO: check if service exists # check service data
(rc, out, err) = module.run_command("%s show '%s'" % (systemctl, unit)) (rc, out, err) = module.run_command("%s show '%s'" % (systemctl, unit))
if rc != 0: if rc != 0:
module.fail_json(msg='failure %d running systemctl show for %r: %s' % (rc, unit, err)) module.fail_json(msg='failure %d running systemctl show for %r: %s' % (rc, unit, err))
found = False
is_initd = sysv_exists(unit)
is_systemd = False
# load return of systemctl show into dictionary for easy access and return # load return of systemctl show into dictionary for easy access and return
k = None
multival = [] multival = []
for line in to_native(out).split('\n'): # systemd can have multiline values delimited with {} if out:
if line.strip(): k = None
if k is None: for line in to_native(out).split('\n'): # systemd can have multiline values delimited with {}
if '=' in line: if line.strip():
k,v = line.split('=', 1) if k is None:
if v.lstrip().startswith('{'): if '=' in line:
if not v.rstrip().endswith('}'): k,v = line.split('=', 1)
multival.append(line) if v.lstrip().startswith('{'):
continue if not v.rstrip().endswith('}'):
result['status'][k] = v.strip() multival.append(line)
k = None continue
else: result['status'][k] = v.strip()
if line.rstrip().endswith('}'): k = None
result['status'][k] = '\n'.join(multival).strip()
multival = []
k = None
else: else:
multival.append(line) if line.rstrip().endswith('}'):
result['status'][k] = '\n'.join(multival).strip()
multival = []
k = None
else:
multival.append(line)
is_systemd = 'LoadState' in result['status'] and result['status']['LoadState'] != 'not-found'
# Check for loading error
if is_systemd and 'LoadError' in result['status']:
module.fail_json(msg="Error loading unit file '%s': %s" % (unit, result['status']['LoadError']))
if 'LoadState' in result['status'] and result['status']['LoadState'] == 'not-found': # Does service exist?
module.fail_json(msg='Could not find the requested service "%r": %s' % (unit, err)) found = is_systemd or is_initd
elif 'LoadError' in result['status']: if is_initd and not is_systemd:
module.fail_json(msg="Failed to get the service status '%s': %s" % (unit, result['status']['LoadError'])) result['warnings'].append('The service (%s) is actually an init script but the system is managed by systemd' % unit)
# mask/unmask the service, if requested # mask/unmask the service, if requested, can operate on services before they are installed
if module.params['masked'] is not None: if module.params['masked'] is not None:
masked = (result['status']['LoadState'] == 'masked') # state is not masked unless systemd affirms otherwise
masked = ('LoadState' in result['status'] and result['status']['LoadState'] == 'masked')
# Change?
if masked != module.params['masked']: if masked != module.params['masked']:
result['changed'] = True result['changed'] = True
if module.params['masked']: if module.params['masked']:
@ -325,10 +331,21 @@ def main():
if not module.check_mode: if not module.check_mode:
(rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit)) (rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit))
if rc != 0: if rc != 0:
# some versions of system CAN mask/unmask non existing services, we only fail on missing if they don't
fail_if_missing(module, found, unit, "cannot %s" % (action))
module.fail_json(msg="Unable to %s service %s: %s" % (action, unit, err)) module.fail_json(msg="Unable to %s service %s: %s" % (action, unit, err))
# Enable/disable service startup at boot if requested # Enable/disable service startup at boot if requested
if module.params['enabled'] is not None: if module.params['enabled'] is not None:
if module.params['enabled']:
action = 'enable'
else:
action = 'disable'
fail_if_missing(module, found, unit, "cannot %s" % (action))
# do we need to enable the service? # do we need to enable the service?
enabled = False enabled = False
(rc, out, err) = module.run_command("%s is-enabled '%s'" % (systemctl, unit)) (rc, out, err) = module.run_command("%s is-enabled '%s'" % (systemctl, unit))
@ -337,11 +354,8 @@ def main():
if rc == 0: if rc == 0:
enabled = True enabled = True
elif rc == 1: elif rc == 1:
# Deals with init scripts
# if both init script and unit file exist stdout should have enabled/disabled, otherwise use rc entries # if both init script and unit file exist stdout should have enabled/disabled, otherwise use rc entries
initscript = '/etc/init.d/' + unit if is_initd and (not out.startswith('disabled') or sysv_is_enabled(unit)):
if os.path.exists(initscript) and os.access(initscript, os.X_OK) and \
(not out.startswith('disabled') or bool(glob.glob('/etc/rc?.d/S??' + unit))):
enabled = True enabled = True
# default to current state # default to current state
@ -350,19 +364,16 @@ def main():
# Change enable/disable if needed # Change enable/disable if needed
if enabled != module.params['enabled']: if enabled != module.params['enabled']:
result['changed'] = True result['changed'] = True
if module.params['enabled']:
action = 'enable'
else:
action = 'disable'
if not module.check_mode: if not module.check_mode:
(rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit)) (rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit))
if rc != 0: if rc != 0:
module.fail_json(msg="Unable to %s service %s: %s" % (action, unit, err)) module.fail_json(msg="Unable to %s service %s: %s" % (action, unit, out + err))
result['enabled'] = not enabled result['enabled'] = not enabled
# set service state if requested
if module.params['state'] is not None: if module.params['state'] is not None:
fail_if_missing(module, found, unit, "cannot check nor set state")
# default to desired state # default to desired state
result['state'] = module.params['state'] result['state'] = module.params['state']
@ -373,17 +384,15 @@ def main():
if module.params['state'] == 'started': if module.params['state'] == 'started':
if result['status']['ActiveState'] != 'active': if result['status']['ActiveState'] != 'active':
action = 'start' action = 'start'
result['changed'] = True
elif module.params['state'] == 'stopped': elif module.params['state'] == 'stopped':
if result['status']['ActiveState'] == 'active': if result['status']['ActiveState'] == 'active':
action = 'stop' action = 'stop'
result['changed'] = True
else: else:
action = module.params['state'][:-2] # remove 'ed' from restarted/reloaded action = module.params['state'][:-2] # remove 'ed' from restarted/reloaded
result['state'] = 'started' result['state'] = 'started'
result['changed'] = True
if action: if action:
result['changed'] = True
if not module.check_mode: if not module.check_mode:
(rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit)) (rc, out, err) = module.run_command("%s %s '%s'" % (systemctl, action, unit))
if rc != 0: if rc != 0: