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

systemd module: Allow to stop activating service (#19383)

Browse source 
* systemd module: Allow to stop activating service

Allow to stop service with ActiveState=activating.

* systemd: Fix incompatibility with Python 2.4
This commit is contained in:
Artur Molchanov 2016-12-15 19:14:33 +03:00 committed by Brian Coca
parent d48ad47fda
commit a8d5358d7f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,6 +239,11 @@ from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.service import sysv_exists, sysv_is_enabled, fail_if_missing from ansible.module_utils.service import sysv_exists, sysv_is_enabled, fail_if_missing
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
def is_running_service(service_status):
return service_status['ActiveState'] in set(['active', 'activating'])
# =========================================== # ===========================================
# Main control flow # Main control flow
@ -382,13 +387,13 @@ def main():
if 'ActiveState' in result['status']: if 'ActiveState' in result['status']:
action = None action = None
if module.params['state'] == 'started': if module.params['state'] == 'started':
if result['status']['ActiveState'] != 'active': if not is_running_service(result['status']):
action = 'start' action = 'start'
elif module.params['state'] == 'stopped': elif module.params['state'] == 'stopped':
if result['status']['ActiveState'] == 'active': if is_running_service(result['status']):
action = 'stop' action = 'stop'
else: else:
if result['status']['ActiveState'] != 'active': if not is_running_service(result['status']):
action = 'start' action = 'start'
else: else:
action = module.params['state'][:-2] # remove 'ed' from restarted/reloaded action = module.params['state'][:-2] # remove 'ed' from restarted/reloaded