Skip to content
Snippets Groups Projects
Commit eac9779d authored by Benjamin Bertrand's avatar Benjamin Bertrand
Browse files

Clean extra vars passed for VM and VIOC creation

Only vmname and domain are required for the ics-ans-deploy-on-proxmox
playbook. All other variables are taken from the inventory.

JIRA INFRA-870 #action In Progress
parent 58bca5af
No related branches found
No related tags found
No related merge requests found
...@@ -95,7 +95,7 @@ AWX_CORE_SERVICES_UPDATE = "ics-ans-core @ DHCP test" ...@@ -95,7 +95,7 @@ AWX_CORE_SERVICES_UPDATE = "ics-ans-core @ DHCP test"
# Assumed to be job if the variable is not defined # Assumed to be job if the variable is not defined
AWX_CORE_SERVICES_UPDATE_RESOURCE = "job" AWX_CORE_SERVICES_UPDATE_RESOURCE = "job"
AWX_CREATE_VM = "deploy-vm-in-proxmox" AWX_CREATE_VM = "deploy-vm-in-proxmox"
AWX_CREATE_VIOC = "ics-ans-deploy-vioc" AWX_CREATE_VIOC = "deploy-vm-in-proxmox"
AWX_ZTP_CONFIGURATION = "ics-ans-ztp" AWX_ZTP_CONFIGURATION = "ics-ans-ztp"
AWX_POST_INSTALL = { AWX_POST_INSTALL = {
"VIOC": {"esss.lu.se": "", "tn.esss.lu.se": "", "cslab.esss.lu.se": ""}, "VIOC": {"esss.lu.se": "", "tn.esss.lu.se": "", "cslab.esss.lu.se": ""},
......
...@@ -84,15 +84,7 @@ class TaskWorker(Worker): ...@@ -84,15 +84,7 @@ class TaskWorker(Worker):
def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job): def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job):
"""Trigger a job to create a virtual machine or virtual IOC""" """Trigger a job to create a virtual machine or virtual IOC"""
domain = interface.network.domain.name domain = interface.network.domain.name
extra_vars = [ extra_vars = [f"vmname={name}", f"domain={domain}"]
f"vmname={name}",
f"memory={memory}",
f"cores={cores}",
f"vcpus={cores}",
f"vlan_name={interface.network.vlan_name}",
f"vlan_id={interface.network.vlan_id}",
f"mac={interface.mac}",
]
if interface.is_ioc: if interface.is_ioc:
task_name = "trigger_vioc_creation" task_name = "trigger_vioc_creation"
job_template = current_app.config["AWX_CREATE_VIOC"] job_template = current_app.config["AWX_CREATE_VIOC"]
...@@ -101,14 +93,6 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job): ...@@ -101,14 +93,6 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job):
task_name = "trigger_vm_creation" task_name = "trigger_vm_creation"
job_template = current_app.config["AWX_CREATE_VM"] job_template = current_app.config["AWX_CREATE_VM"]
post_job_template = current_app.config["AWX_POST_INSTALL"]["VM"].get(domain) post_job_template = current_app.config["AWX_POST_INSTALL"]["VM"].get(domain)
extra_vars.extend(
[
f"ip_address={interface.ip}",
f"domain={domain}",
f"netmask={interface.network.netmask}",
f"gateway={interface.network.gateway}",
]
)
current_app.logger.info( current_app.logger.info(
f"Launch new job to create the {name} VM: {job_template} with {extra_vars}" f"Launch new job to create the {name} VM: {job_template} with {extra_vars}"
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment