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

systemd - supports new systemctl output message for chroot (#71197) (#71330)

Browse source 
The message generated by systemctl has been updated in 9321e23c40, which requires a corresponding change in the systemd module.

In addition, this fixes the module when the SYSTEMD_OFFLINE environment variable is set.

(cherry picked from commit a1a50bb3cd)
This commit is contained in:
Lorenzo Castelli 2020-08-27 10:34:59 -07:00 committed by GitHub
parent 4cfe2cf8dc
commit ac248cf34a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/71197-systemctl-ignore-message.yaml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- systemd - fixed chroot usage on new versions of systemd, that broke because of upstream changes in systemctl output
- systemd - made the systemd module work correctly when the SYSTEMD_OFFLINE environment variable is set

6
lib/ansible/modules/systemd.py
View file

@ -277,7 +277,7 @@ def is_deactivating_service(service_status):
def request_was_ignored(out): def request_was_ignored(out):
return '=' not in out and 'ignoring request' in out return '=' not in out and ('ignoring request' in out or 'ignoring command' in out)
def parse_systemctl_show(lines): def parse_systemctl_show(lines):
@ -535,8 +535,8 @@ def main():
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, err))
# check for chroot # check for chroot
elif is_chroot(module): elif is_chroot(module) or os.environ.get('SYSTEMD_OFFLINE') == '1':
module.warn("Target is a chroot. This can lead to false positives or prevent the init system tools from working.") module.warn("Target is a chroot or systemd is offline. This can lead to false positives or prevent the init system tools from working.")
else: else:
# this should not happen? # this should not happen?
module.fail_json(msg="Service is in unknown state", status=result['status']) module.fail_json(msg="Service is in unknown state", status=result['status'])

7
test/integration/targets/systemd/tasks/main.yml
View file

@ -72,4 +72,11 @@
- result is failed - result is failed
- result is search("Could not find the requested service {{ fake_service }}") - result is search("Could not find the requested service {{ fake_service }}")
- name: check that the module works even when systemd is offline (eg in chroot)
systemd:
name: "{{ running_names.stdout_lines|random }}"
state: started
environment:
SYSTEMD_OFFLINE: 1
when: 'systemctl_check.rc == 0' when: 'systemctl_check.rc == 0'