From eac9779d466384913b828aad2dc76bdb1a5267b3 Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Thu, 7 Mar 2019 13:59:26 +0100
Subject: [PATCH] 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
---
app/settings.py | 2 +-
app/tasks.py | 18 +-----------------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/app/settings.py b/app/settings.py
index 4e567ed..33222d3 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -95,7 +95,7 @@ AWX_CORE_SERVICES_UPDATE = "ics-ans-core @ DHCP test"
# Assumed to be job if the variable is not defined
AWX_CORE_SERVICES_UPDATE_RESOURCE = "job"
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_POST_INSTALL = {
"VIOC": {"esss.lu.se": "", "tn.esss.lu.se": "", "cslab.esss.lu.se": ""},
diff --git a/app/tasks.py b/app/tasks.py
index c861cf4..52b8ccc 100644
--- a/app/tasks.py
+++ b/app/tasks.py
@@ -84,15 +84,7 @@ class TaskWorker(Worker):
def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job):
"""Trigger a job to create a virtual machine or virtual IOC"""
domain = interface.network.domain.name
- extra_vars = [
- 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}",
- ]
+ extra_vars = [f"vmname={name}", f"domain={domain}"]
if interface.is_ioc:
task_name = "trigger_vioc_creation"
job_template = current_app.config["AWX_CREATE_VIOC"]
@@ -101,14 +93,6 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job):
task_name = "trigger_vm_creation"
job_template = current_app.config["AWX_CREATE_VM"]
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(
f"Launch new job to create the {name} VM: {job_template} with {extra_vars}"
)
--
GitLab