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

Clean trigger VM creation

No need to pass interface/memory/cores to trigger_vm_creation

JIRA INFRA-870
parent b63fae18
No related branches found
Tags 0.18.1
No related merge requests found
...@@ -199,13 +199,8 @@ def view_host(name): ...@@ -199,13 +199,8 @@ def view_host(name):
sa.orm.attributes.flag_modified(host, "ansible_vars") sa.orm.attributes.flag_modified(host, "ansible_vars")
except AttributeError: except AttributeError:
host.ansible_vars = csentry_vars host.ansible_vars = csentry_vars
interface = host.interfaces[0]
task = tasks.trigger_vm_creation( task = tasks.trigger_vm_creation(
name, host, skip_post_install_job=form.skip_post_install_job.data
interface,
csentry_vars["csentry_vm_memory"],
csentry_vars["csentry_vm_cores"],
skip_post_install_job=form.skip_post_install_job.data,
) )
db.session.commit() db.session.commit()
current_app.logger.info(f"Creation of {name} requested: task {task.id}") current_app.logger.info(f"Creation of {name} requested: task {task.id}")
......
...@@ -81,11 +81,11 @@ class TaskWorker(Worker): ...@@ -81,11 +81,11 @@ class TaskWorker(Worker):
super().prepare_job_execution(job) super().prepare_job_execution(job)
def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job): def trigger_vm_creation(host, 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 = host.main_interface.network.domain
extra_vars = [f"vmname={name}", f"domain={domain}"] extra_vars = [f"vmname={host.name}", f"domain={domain}"]
if interface.is_ioc: if host.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"]
post_job_template = current_app.config["AWX_POST_INSTALL"]["VIOC"].get(domain) post_job_template = current_app.config["AWX_POST_INSTALL"]["VIOC"].get(domain)
...@@ -94,7 +94,7 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job): ...@@ -94,7 +94,7 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job):
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)
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 {host} VM: {job_template} with {extra_vars}"
) )
task = current_user.launch_task( task = current_user.launch_task(
task_name, task_name,
...@@ -109,12 +109,12 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job): ...@@ -109,12 +109,12 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job):
"trigger_post_install_job", "trigger_post_install_job",
func="launch_job_template", func="launch_job_template",
job_template=post_job_template, job_template=post_job_template,
limit=f"{name}.{domain}", limit=f"{host.fqdn}",
depends_on=task.id, depends_on=task.id,
timeout=500, timeout=500,
) )
current_app.logger.info( current_app.logger.info(
f"Trigger post install job: run {post_job_template} on {name}.{domain}" f"Trigger post install job: run {post_job_template} on {host.fqdn}"
) )
return task return task
......
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