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

cleanup(inventory): Move set_composable_vars to bottom of file

Browse Source 
This suits the control flow a bit better and helps refactoring the
inventory plugin.

Signed-off-by: Felix Matouschek <fmatouschek@redhat.com>
This commit is contained in:
Felix Matouschek
2024-06-27 10:28:30 +02:00
parent 63a03d75b2
commit 01a0e535e2
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/inventory/kubevirt.py
View File

@@ -658,23 +658,6 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
self.set_composable_vars(vmi_name) self.set_composable_vars(vmi_name)
def set_composable_vars(self, vmi_name: str) -> None:
"""
set_composable_vars sets vars per
https://docs.ansible.com/ansible/latest/dev_guide/developing_inventory.html
"""
host_vars = self.inventory.get_host(vmi_name).get_vars()
strict = self.get_option("strict")
self._set_composite_vars(
self.get_option("compose"), host_vars, vmi_name, strict=True
)
self._add_host_to_composed_groups(
self.get_option("groups"), host_vars, vmi_name, strict=strict
)
self._add_host_to_keyed_groups(
self.get_option("keyed_groups"), host_vars, vmi_name, strict=strict
)
def get_ssh_services_for_namespace(self, client: K8SClient, namespace: str) -> Dict: def get_ssh_services_for_namespace(self, client: K8SClient, namespace: str) -> Dict:
""" """
get_ssh_services_for_namespace retrieves all services of a namespace exposing port 22/ssh. get_ssh_services_for_namespace retrieves all services of a namespace exposing port 22/ssh.
@@ -756,3 +739,20 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
self.inventory.set_variable(vmi_name, "ansible_host", ansible_host) self.inventory.set_variable(vmi_name, "ansible_host", ansible_host)
self.inventory.set_variable(vmi_name, "ansible_port", ansible_port) self.inventory.set_variable(vmi_name, "ansible_port", ansible_port)
def set_composable_vars(self, vmi_name: str) -> None:
"""
set_composable_vars sets vars per
https://docs.ansible.com/ansible/latest/dev_guide/developing_inventory.html
"""
host_vars = self.inventory.get_host(vmi_name).get_vars()
strict = self.get_option("strict")
self._set_composite_vars(
self.get_option("compose"), host_vars, vmi_name, strict=True
)
self._add_host_to_composed_groups(
self.get_option("groups"), host_vars, vmi_name, strict=strict
)
self._add_host_to_keyed_groups(
self.get_option("keyed_groups"), host_vars, vmi_name, strict=strict
)