From cbd3df369f0efa4f67b74ad76c431a3b2c357f26 Mon Sep 17 00:00:00 2001 From: Carlos Matos Date: Mon, 28 Sep 2020 15:21:44 -0400 Subject: [PATCH] Adding check to ensure 'container' get's added to guest_tech when appropriate (#71385) --- .../71385-enhance-container-reporting-linux-vfacts.yml | 2 ++ lib/ansible/module_utils/facts/virtual/linux.py | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 changelogs/fragments/71385-enhance-container-reporting-linux-vfacts.yml diff --git a/changelogs/fragments/71385-enhance-container-reporting-linux-vfacts.yml b/changelogs/fragments/71385-enhance-container-reporting-linux-vfacts.yml new file mode 100644 index 00000000000..5dc528dce25 --- /dev/null +++ b/changelogs/fragments/71385-enhance-container-reporting-linux-vfacts.yml @@ -0,0 +1,2 @@ +minor_changes: + - linux facts - Add additional check to ensure 'container' virtual fact gets added to guest_tech when appropriate (https://github.com/ansible/ansible/pull/71385) diff --git a/lib/ansible/module_utils/facts/virtual/linux.py b/lib/ansible/module_utils/facts/virtual/linux.py index d7a9f73eb0a..90a393d6383 100644 --- a/lib/ansible/module_utils/facts/virtual/linux.py +++ b/lib/ansible/module_utils/facts/virtual/linux.py @@ -104,6 +104,10 @@ class LinuxVirtual(Virtual): virtual_facts['virtualization_role'] = 'guest' found_virt = True + # ensure 'container' guest_tech is appropriately set + if guest_tech.intersection(set(['docker', 'lxc', 'podman', 'openvz'])) or systemd_container: + guest_tech.add('container') + if os.path.exists("/proc/xen"): is_xen_host = False try: