diff --git a/app/network/views.py b/app/network/views.py index af320d307343e39ff95b5ba4f9ae05ff76c50264..3cdc8de03dcdc6dd030c437848923eb06955f3bd 100644 --- a/app/network/views.py +++ b/app/network/views.py @@ -199,13 +199,8 @@ def view_host(name): sa.orm.attributes.flag_modified(host, "ansible_vars") except AttributeError: host.ansible_vars = csentry_vars - interface = host.interfaces[0] task = tasks.trigger_vm_creation( - name, - interface, - csentry_vars["csentry_vm_memory"], - csentry_vars["csentry_vm_cores"], - skip_post_install_job=form.skip_post_install_job.data, + host, skip_post_install_job=form.skip_post_install_job.data ) db.session.commit() current_app.logger.info(f"Creation of {name} requested: task {task.id}") diff --git a/app/tasks.py b/app/tasks.py index 52b8ccc95b5e8f835ba2faf81f129078d44d211e..bbcd2167d9e3e9b8a402b3531c24c914cf85ea66 100644 --- a/app/tasks.py +++ b/app/tasks.py @@ -81,11 +81,11 @@ class TaskWorker(Worker): 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""" - domain = interface.network.domain.name - extra_vars = [f"vmname={name}", f"domain={domain}"] - if interface.is_ioc: + domain = host.main_interface.network.domain + extra_vars = [f"vmname={host.name}", f"domain={domain}"] + if host.is_ioc: task_name = "trigger_vioc_creation" job_template = current_app.config["AWX_CREATE_VIOC"] 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): job_template = current_app.config["AWX_CREATE_VM"] post_job_template = current_app.config["AWX_POST_INSTALL"]["VM"].get(domain) 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_name, @@ -109,12 +109,12 @@ def trigger_vm_creation(name, interface, memory, cores, skip_post_install_job): "trigger_post_install_job", func="launch_job_template", job_template=post_job_template, - limit=f"{name}.{domain}", + limit=f"{host.fqdn}", depends_on=task.id, timeout=500, ) 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