This commit is contained in:
parent
5dd6bb8661
commit
ffa15a72a3
@ -9,17 +9,16 @@ from __future__ import (absolute_import, division, print_function)
|
|||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
DOCUMENTATION = """
|
DOCUMENTATION = """
|
||||||
---
|
name: proxmox
|
||||||
name: proxmox
|
plugin_type: inventory
|
||||||
plugin_type: inventory
|
short_description: Proxmox VE inventory source
|
||||||
short_description: Proxmox VE inventory source
|
version_added: 1.1.0
|
||||||
version_added: 1.1.0
|
description:
|
||||||
description:
|
|
||||||
- Get inventory hosts from the proxmox service.
|
- Get inventory hosts from the proxmox service.
|
||||||
- "Uses a configuration file as an inventory source, it must end in C(.proxmox.yml) or C(.proxmox.yaml) and has a C(plugin: xoxys.general.proxmox) entry."
|
- "Uses a configuration file as an inventory source, it must end in C(.proxmox.yml) or C(.proxmox.yaml) and has a C(plugin: xoxys.general.proxmox) entry."
|
||||||
extends_documentation_fragment:
|
extends_documentation_fragment:
|
||||||
- inventory_cache
|
- inventory_cache
|
||||||
options:
|
options:
|
||||||
plugin:
|
plugin:
|
||||||
description: The name of this plugin, it should always be set to C(xoxys.general.proxmox) for this plugin to recognize it as it's own.
|
description: The name of this plugin, it should always be set to C(xoxys.general.proxmox) for this plugin to recognize it as it's own.
|
||||||
required: yes
|
required: yes
|
||||||
@ -75,7 +74,8 @@ options:
|
|||||||
description: Toggle, if C(true) the plugin will retrieve host facts from the server
|
description: Toggle, if C(true) the plugin will retrieve host facts from the server
|
||||||
type: boolean
|
type: boolean
|
||||||
default: True
|
default: True
|
||||||
|
requirements:
|
||||||
|
- "proxmoxer"
|
||||||
""" # noqa
|
""" # noqa
|
||||||
|
|
||||||
EXAMPLES = """
|
EXAMPLES = """
|
||||||
@ -187,7 +187,7 @@ class InventoryModule(BaseInventoryPlugin):
|
|||||||
except Exception: # noqa
|
except Exception: # noqa
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if networks and type(networks) is list:
|
if networks and isinstance(networks, list):
|
||||||
for network in networks:
|
for network in networks:
|
||||||
for ip_address in network["ip-addresses"]:
|
for ip_address in network["ip-addresses"]:
|
||||||
address = validate(ip_address["ip-address"])
|
address = validate(ip_address["ip-address"])
|
||||||
|
@ -78,6 +78,7 @@ options:
|
|||||||
C(-P)/C(--policy) to specify rules."
|
C(-P)/C(--policy) to specify rules."
|
||||||
required: false
|
required: false
|
||||||
type: str
|
type: str
|
||||||
|
default: ""
|
||||||
state:
|
state:
|
||||||
description:
|
description:
|
||||||
- The state this rules fragment should be in.
|
- The state this rules fragment should be in.
|
||||||
|
@ -955,18 +955,18 @@ def create_vm(
|
|||||||
|
|
||||||
# If update, ensure existing disks are not recreated.
|
# If update, ensure existing disks are not recreated.
|
||||||
if update:
|
if update:
|
||||||
for k, _v in disks.items():
|
for k, v in disks.items():
|
||||||
if results["disks"].get(k):
|
if results["disks"].get(k):
|
||||||
storage_id = results["disks"][k]["storage_id"]
|
storage_id = results["disks"][k]["storage_id"]
|
||||||
storage_opts = results["disks"][k]["storage_opts"]
|
storage_opts = results["disks"][k]["storage_opts"]
|
||||||
opts = ",".join(disks[k]["opts"])
|
opts = ",".join(v["opts"])
|
||||||
kwargs[k.rstrip(string.digits)][k] = f"{storage_id}:{storage_opts},{opts}"
|
kwargs[k.rstrip(string.digits)][k] = f"{storage_id}:{storage_opts},{opts}"
|
||||||
|
|
||||||
for k, _v in nets.items():
|
for k, v in nets.items():
|
||||||
if results["nets"].get(k):
|
if results["nets"].get(k):
|
||||||
net_id = results["nets"][k]["net_id"]
|
net_id = results["nets"][k]["net_id"]
|
||||||
net_opts = results["nets"][k]["net_opts"]
|
net_opts = results["nets"][k]["net_opts"]
|
||||||
opts = ",".join(nets[k]["opts"])
|
opts = ",".join(v["opts"])
|
||||||
kwargs[k.rstrip(string.digits)][k] = f"{net_id}={net_opts},{opts}"
|
kwargs[k.rstrip(string.digits)][k] = f"{net_id}={net_opts},{opts}"
|
||||||
|
|
||||||
# Convert all dict in kwargs to elements.
|
# Convert all dict in kwargs to elements.
|
||||||
|
@ -31,6 +31,7 @@ options:
|
|||||||
- New value of the variable
|
- New value of the variable
|
||||||
required: False
|
required: False
|
||||||
type: str
|
type: str
|
||||||
|
default: ""
|
||||||
state:
|
state:
|
||||||
required: False
|
required: False
|
||||||
default: "present"
|
default: "present"
|
||||||
|
Loading…
Reference in New Issue
Block a user