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

systemd module will now wait on deactivating state (#59471)

Browse source 
If a service is in the 'deactivating' state running systemctl stop foo,
would wait for the foo service to actually stop before it exits. The
module didn't behave like that and it considered the deactivating state
as if the service wasn't running. This change will align the module with
the systemctl behaviour.
This commit is contained in:
Strahinja Kustudic 2019-08-08 18:56:17 +02:00 committed by Sam Doran
parent 97a0810e0f
commit 54d9d7805d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/59471-systemd-wait-while-deactivating.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- systemd - wait for a service which is in deactivating state when using ``state=stopped`` (https://github.com/ansible/ansible/pull/59471)

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

@ -270,7 +270,11 @@ from ansible.module_utils._text import to_native
def is_running_service(service_status): def is_running_service(service_status):
return service_status['ActiveState'] in set(['active', 'activating']) return service_status['ActiveState'] in set(['active', 'activating', 'deactivating'])
def is_deactivating_service(service_status):
return service_status['ActiveState'] in set(['deactivating'])
def request_was_ignored(out): def request_was_ignored(out):
@ -498,7 +502,7 @@ def main():
if not is_running_service(result['status']): if not is_running_service(result['status']):
action = 'start' action = 'start'
elif module.params['state'] == 'stopped': elif module.params['state'] == 'stopped':
if is_running_service(result['status']): if is_running_service(result['status']) or is_deactivating_service(result['status']):
action = 'stop' action = 'stop'
else: else:
if not is_running_service(result['status']): if not is_running_service(result['status']):