From 47e64dc37153b5584ce0a467d086b8edd6300e85 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 10 Sep 2024 13:32:52 -0400 Subject: [PATCH] service_facts, fix systemd/ubuntu failed reporting (#83424) Avoid check description, better comments --- changelogs/fragments/service_facts_systemd_fix.yml | 2 ++ lib/ansible/modules/service_facts.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/service_facts_systemd_fix.yml diff --git a/changelogs/fragments/service_facts_systemd_fix.yml b/changelogs/fragments/service_facts_systemd_fix.yml new file mode 100644 index 00000000000..36064424389 --- /dev/null +++ b/changelogs/fragments/service_facts_systemd_fix.yml @@ -0,0 +1,2 @@ +bugfixes: + - service_facts will now detect failed services more accurately across systemd implementations. diff --git a/lib/ansible/modules/service_facts.py b/lib/ansible/modules/service_facts.py index 5be5119bd26..810e8d2a381 100644 --- a/lib/ansible/modules/service_facts.py +++ b/lib/ansible/modules/service_facts.py @@ -263,7 +263,7 @@ class SystemctlScanService(BaseService): def _list_from_units(self, systemctl_path, services): # list units as systemd sees them - rc, stdout, stderr = self.module.run_command("%s list-units --no-pager --type service --all" % systemctl_path, use_unsafe_shell=True) + rc, stdout, stderr = self.module.run_command("%s list-units --no-pager --type service --all --plain" % systemctl_path, use_unsafe_shell=True) if rc != 0: self.module.warn("Could not list units from systemd: %s" % stderr) else: @@ -272,16 +272,18 @@ class SystemctlScanService(BaseService): state_val = "stopped" status_val = "unknown" fields = line.split() + + # systemd sometimes gives misleading status + # check all fields for bad states for bad in self.BAD_STATES: - if bad in fields: # dot is 0 + # except description + if bad in fields[:-1]: status_val = bad - fields = fields[1:] break else: # active/inactive status_val = fields[2] - # array is normalize so predictable now service_name = fields[0] if fields[3] == "running": state_val = "running"