internet/kubevirt.core
3
0
Fork 0
mirror of https://github.com/kubevirt/kubevirt.core.git synced 2026-03-27 03:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

inventory: Flatten created groups

Browse Source 
Drop creation of the namespace_vmis_group as it is redundant.

Signed-off-by: Felix Matouschek <fmatouschek@redhat.com>
This commit is contained in:
Felix Matouschek
2023-09-05 14:45:45 +02:00
parent 20a3534f37
commit 100bcee082
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/0_flatten_groups.yml Normal file
View File

@@ -0,0 +1,2 @@
minor_changes:
- "inventory: Drop creation of the namespace_vmis_group as it is redundant"

10
plugins/inventory/kubevirt.py
View File

@@ -444,18 +444,12 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
services = self.get_ssh_services_for_namespace(client, namespace) services = self.get_ssh_services_for_namespace(client, namespace)
namespace_group = f"namespace_{namespace}"
namespace_vmis_group = f"{namespace_group}_vmis"
name = self._sanitize_group_name(name) name = self._sanitize_group_name(name)
namespace_group = self._sanitize_group_name(namespace_group) namespace_group = self._sanitize_group_name(f"namespace_{namespace}")
namespace_vmis_group = self._sanitize_group_name(namespace_vmis_group)
self.inventory.add_group(name) self.inventory.add_group(name)
self.inventory.add_group(namespace_group) self.inventory.add_group(namespace_group)
self.inventory.add_child(name, namespace_group) self.inventory.add_child(name, namespace_group)
self.inventory.add_group(namespace_vmis_group)
self.inventory.add_child(namespace_group, namespace_vmis_group)
for vmi in vmi_list.items: for vmi in vmi_list.items:
if not (vmi.status and vmi.status.interfaces): if not (vmi.status and vmi.status.interfaces):
@@ -500,7 +494,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
# Add vmi to the namespace group, and to each label_value group # Add vmi to the namespace group, and to each label_value group
self.inventory.add_host(vmi_name) self.inventory.add_host(vmi_name)
self.inventory.add_child(namespace_vmis_group, vmi_name) self.inventory.add_child(namespace_group, vmi_name)
for group in vmi_groups: for group in vmi_groups:
self.inventory.add_child(group, vmi_name) self.inventory.add_child(group, vmi_name)