diff --git a/app/settings.py b/app/settings.py index 4e567edb69643027d12f83ff16ce97e846df35c3..33222d38642697472f1759de79ed42b6a5a2bff5 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 c861cf43aa1c50455d56ff575d58b79c7f064b25..52b8ccc95b5e8f835ba2faf81f129078d44d211e 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}" )