Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

proxmox inventory: fix for agent enabled #4910

Merged
merged 8 commits into from
Jul 12, 2022
Merged

proxmox inventory: fix for agent enabled #4910

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dfb8d0f
Update proxmox.py
planeturban Jun 30, 2022
441b2e0
Forgot a debug print.
planeturban Jun 30, 2022
df64f10
pep
planeturban Jun 30, 2022
c094f36
Check if int, old school way.
planeturban Jun 30, 2022
4e094cd
pep, once again.
planeturban Jun 30, 2022
81b2ed7
Create 4910-fix-for-agent-enabled.yml
planeturban Jul 4, 2022
c62718c
Must check the first listentry for enabled=1
planeturban Jul 4, 2022
5a82969
Update changelogs/fragments/4910-fix-for-agent-enabled.yml
planeturban Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions plugins/inventory/proxmox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,20 @@ def _get_vm_config(self, properties, node, vmid, vmtype, name):
properties[parsed_key] = [tag.strip() for tag in stripped_value.split(",")]

# The first field in the agent string tells you whether the agent is enabled
# the rest of the comma separated string is extra config for the agent
if config == 'agent' and int(value.split(',')[0]):
agent_iface_value = self._get_agent_network_interfaces(node, vmid, vmtype)
if agent_iface_value:
agent_iface_key = self.to_safe('%s%s' % (key, "_interfaces"))
properties[agent_iface_key] = agent_iface_value
# the rest of the comma separated string is extra config for the agent.
# In some (newer versions of proxmox) instances it can be 'enabled=1'.
if config == 'agent':
agent_enabled = 0
try:
agent_enabled = int(value.split(',')[0])
except ValueError:
if value.split(',') == "enabled=1":
agent_enabled = 1
if agent_enabled:
agent_iface_value = self._get_agent_network_interfaces(node, vmid, vmtype)
if agent_iface_value:
agent_iface_key = self.to_safe('%s%s' % (key, "_interfaces"))
properties[agent_iface_key] = agent_iface_value

if config == 'lxc':
out_val = {}
Expand Down