diff options
| author | Lorenzo Castelli <lcastelli@google.com> | 2020-08-27 10:34:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 12:34:59 -0500 |
| commit | ac248cf34a6ba131f2f5549ecf712d9c44c89885 (patch) | |
| tree | c2e9452799cf22db43b02a1bf4a04704df943fe3 | |
| parent | 4cfe2cf8dcd093b5457436c63144758fc3beeb52 (diff) | |
| download | ansible-ac248cf34a6ba131f2f5549ecf712d9c44c89885.tar.gz | |
systemd - supports new systemctl output message for chroot (#71197) (#71330)
The message generated by systemctl has been updated in https://github.com/systemd/systemd/commit/9321e23c40f3dc6bd785105ce882cbad6447a1c6, 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 a1a50bb3cd0c2d6f2f4cb260a43553c23e806d8a)
| -rw-r--r-- | changelogs/fragments/71197-systemctl-ignore-message.yaml | 3 | ||||
| -rw-r--r-- | lib/ansible/modules/systemd.py | 6 | ||||
| -rw-r--r-- | test/integration/targets/systemd/tasks/main.yml | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/changelogs/fragments/71197-systemctl-ignore-message.yaml b/changelogs/fragments/71197-systemctl-ignore-message.yaml new file mode 100644 index 0000000000..eabf59b29c --- /dev/null +++ b/changelogs/fragments/71197-systemctl-ignore-message.yaml @@ -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 diff --git a/lib/ansible/modules/systemd.py b/lib/ansible/modules/systemd.py index b1eefae103..8ad9cbafab 100644 --- a/lib/ansible/modules/systemd.py +++ b/lib/ansible/modules/systemd.py @@ -277,7 +277,7 @@ def is_deactivating_service(service_status): 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): @@ -535,8 +535,8 @@ def main(): if rc != 0: module.fail_json(msg="Unable to %s service %s: %s" % (action, unit, err)) # check for chroot - elif is_chroot(module): - module.warn("Target is a chroot. This can lead to false positives or prevent the init system tools from working.") + elif is_chroot(module) or os.environ.get('SYSTEMD_OFFLINE') == '1': + 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: # this should not happen? module.fail_json(msg="Service is in unknown state", status=result['status']) diff --git a/test/integration/targets/systemd/tasks/main.yml b/test/integration/targets/systemd/tasks/main.yml index 282988b356..1d98da8db7 100644 --- a/test/integration/targets/systemd/tasks/main.yml +++ b/test/integration/targets/systemd/tasks/main.yml @@ -72,4 +72,11 @@ - result is failed - 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' |