From c19a10e13a299a97cde7e7dfba28d5b8b8301f01 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 28 Jul 2020 10:35:34 -0500 Subject: [PATCH] RHEV virt facts: Detect vdsmd in addition to vdsm (#70901) Change: - Look for the `vdsmd` process in addition to `vdsm` as before. Tickets: - Fixes #66147 Signed-off-by: Rick Elrod --- changelogs/fragments/66147_rhev_vdsm_vdsmd.yml | 2 ++ lib/ansible/module_utils/facts/virtual/linux.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/66147_rhev_vdsm_vdsmd.yml diff --git a/changelogs/fragments/66147_rhev_vdsm_vdsmd.yml b/changelogs/fragments/66147_rhev_vdsm_vdsmd.yml new file mode 100644 index 00000000000..41062a9e417 --- /dev/null +++ b/changelogs/fragments/66147_rhev_vdsm_vdsmd.yml @@ -0,0 +1,2 @@ +minor_changes: + - virtualization facts - Detect ``vdsmd`` in addition to ``vdsm`` when trying to detect RHEV hosts. (https://github.com/ansible/ansible/issues/66147) diff --git a/lib/ansible/module_utils/facts/virtual/linux.py b/lib/ansible/module_utils/facts/virtual/linux.py index db591402871..e19193cfd73 100644 --- a/lib/ansible/module_utils/facts/virtual/linux.py +++ b/lib/ansible/module_utils/facts/virtual/linux.py @@ -206,7 +206,7 @@ class LinuxVirtual(Virtual): try: with open(f) as virt_fh: comm_content = virt_fh.read().rstrip() - if comm_content == 'vdsm': + if comm_content in ('vdsm', 'vdsmd'): virtual_facts['virtualization_type'] = 'RHEV' break except Exception: