From 3abc2ae7af2044464f4b47b92aeb4a9d43f0e285 Mon Sep 17 00:00:00 2001 From: nicoo Date: Mon, 28 Jan 2019 16:40:09 +0100 Subject: [PATCH] Make `run_installer` default to no in the libvirt template --- ansible/roles/vm/install/templates/libvirt-domain.xml.j2 | 4 ++-- ansible/vm-update.yml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ansible/roles/vm/install/templates/libvirt-domain.xml.j2 b/ansible/roles/vm/install/templates/libvirt-domain.xml.j2 index 9119f64..ff2ee60 100644 --- a/ansible/roles/vm/install/templates/libvirt-domain.xml.j2 +++ b/ansible/roles/vm/install/templates/libvirt-domain.xml.j2 @@ -5,7 +5,7 @@ {{ hostvars[hostname].install_cooked.numcpu }} hvm -{% if run_installer %} +{% if run_installer | default(False) %} {{ debian_installer_path }}/{{ install_distro }}-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/linux {{ preseed_tmpdir }}/initrd.preseed.gz console=ttyS0,115200n8 @@ -19,7 +19,7 @@ destroy -{% if run_installer %} +{% if run_installer | default(False) %} destroy destroy {% else %} diff --git a/ansible/vm-update.yml b/ansible/vm-update.yml index 548a49f..a5a2c83 100644 --- a/ansible/vm-update.yml +++ b/ansible/vm-update.yml @@ -33,9 +33,6 @@ - name: Update VM definition hosts: _vmhost_ - vars: - run_installer: no - tasks: - name: Wait for VM to shut down wait_for_virt: -- 1.7.10.4