From aaa1ac1f60bfe1f2b96d25a2985b9549cbad4b51 Mon Sep 17 00:00:00 2001 From: Stein van Broekhoven Date: Tue, 1 Apr 2025 13:52:48 +0200 Subject: [PATCH 1/4] improve ansible_host in proxmox inventory plugin I had this issue myself and found out there was already an issue thread: https://github.com/ansible-collections/community.general/issues/5906 this fixes the issue for hope we can all benefit after this gets merged --- plugins/inventory/proxmox.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/plugins/inventory/proxmox.py b/plugins/inventory/proxmox.py index f2efef9bf8..1fd8abad02 100644 --- a/plugins/inventory/proxmox.py +++ b/plugins/inventory/proxmox.py @@ -364,13 +364,27 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): return ret['members'] def _get_node_ip(self, node): - ret = self._get_json(f"{self.proxmox_url}/api2/json/nodes/{node}/network") + ret = self._get_json("%s/api2/json/nodes/%s/network" % (self.proxmox_url, node)) + # sort interface by iface name to make selection as stable as possible + ret.sort(key=lambda x: x['iface']) + for iface in ret: try: + # only process interfaces adhering to these rules + if 'active' not in iface: + self.display.vvv("Interface %s on node %s does not have an active state" % (iface['iface'], node)) + continue + if 'address' not in iface: + self.display.vvv("Interface %s on node %s does not have an address" % (iface['iface'], node)) + continue + if 'gateway' not in iface: + self.display.vvv("Interface %s on node %s does not have a gateway" % (iface['iface'], node)) + continue return iface['address'] except Exception: - return None + continue + return None def _get_lxc_interfaces(self, properties, node, vmid): status_key = self._fact('status') From 573aa50700c19bc076fc21279b7746b7c5ac0d83 Mon Sep 17 00:00:00 2001 From: Stein van Broekhoven Date: Tue, 1 Apr 2025 14:05:05 +0200 Subject: [PATCH 2/4] f string styling --- plugins/inventory/proxmox.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/inventory/proxmox.py b/plugins/inventory/proxmox.py index 1fd8abad02..8eb6c9d77b 100644 --- a/plugins/inventory/proxmox.py +++ b/plugins/inventory/proxmox.py @@ -364,7 +364,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): return ret['members'] def _get_node_ip(self, node): - ret = self._get_json("%s/api2/json/nodes/%s/network" % (self.proxmox_url, node)) + ret = self._get_json(f"{self.proxmox_url}/api2/json/nodes/{node}/network") # sort interface by iface name to make selection as stable as possible ret.sort(key=lambda x: x['iface']) @@ -373,13 +373,13 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): try: # only process interfaces adhering to these rules if 'active' not in iface: - self.display.vvv("Interface %s on node %s does not have an active state" % (iface['iface'], node)) + self.display.vvv(f"Interface {iface['iface']} on node {node} does not have an active state") continue if 'address' not in iface: - self.display.vvv("Interface %s on node %s does not have an address" % (iface['iface'], node)) + self.display.vvv(f"Interface {iface['iface']} on node {node} does not have an address") continue if 'gateway' not in iface: - self.display.vvv("Interface %s on node %s does not have a gateway" % (iface['iface'], node)) + self.display.vvv(f"Interface {iface['iface']} on node {node} does not have a gateway") continue return iface['address'] except Exception: From 4399a9cd5597e9471a4046aaede8cbebf8803a25 Mon Sep 17 00:00:00 2001 From: Stein van Broekhoven Date: Tue, 1 Apr 2025 14:12:46 +0200 Subject: [PATCH 3/4] add log line for the successful address selection --- plugins/inventory/proxmox.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/inventory/proxmox.py b/plugins/inventory/proxmox.py index 8eb6c9d77b..3059bd1e7c 100644 --- a/plugins/inventory/proxmox.py +++ b/plugins/inventory/proxmox.py @@ -381,6 +381,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): if 'gateway' not in iface: self.display.vvv(f"Interface {iface['iface']} on node {node} does not have a gateway") continue + self.display.vv(f"Using interface {iface['iface']} on node {node} with address {iface['address']} as node ip for ansible_host") return iface['address'] except Exception: continue From b4acc47389c077021a2bd13be18956083e27a474 Mon Sep 17 00:00:00 2001 From: Stein van Broekhoven Date: Tue, 1 Apr 2025 14:14:26 +0200 Subject: [PATCH 4/4] remove white space --- plugins/inventory/proxmox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/inventory/proxmox.py b/plugins/inventory/proxmox.py index 3059bd1e7c..0f41cabe7d 100644 --- a/plugins/inventory/proxmox.py +++ b/plugins/inventory/proxmox.py @@ -368,7 +368,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): # sort interface by iface name to make selection as stable as possible ret.sort(key=lambda x: x['iface']) - + for iface in ret: try: # only process interfaces adhering to these rules