6 files changed, 6 insertions, 5 deletions
diff --git a/roles/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/preseed/templates/preseed_debian-buster.cfg.j2
index 7dbeb680..6e9f4e47 100644
--- a/roles/preseed/templates/preseed_debian-buster.cfg.j2
+++ b/roles/preseed/templates/preseed_debian-buster.cfg.j2
@@ -10,7 +10,7 @@ d-i keyboard-configuration/xkb-keymap select us
 d-i hw-detect/load_firmware boolean false
 
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
-{% if install_dhcp is defined and install_dhcp %}
+{% if 'install_dhcp' in hostvars[hostname] and hostvars[hostname].install_dhcp %}
 d-i netcfg/disable_dhcp boolean false
 d-i netcfg/disable_autoconfig boolean false
 {% else %}
diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index d99a7626..69a6ca5b 100644
--- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -10,7 +10,7 @@ d-i keyboard-configuration/xkb-keymap select us
 d-i hw-detect/load_firmware boolean false
 
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
-{% if install_dhcp is defined and install_dhcp %}
+{% if 'install_dhcp' in hostvars[hostname] and hostvars[hostname].install_dhcp %}
 d-i netcfg/disable_dhcp boolean false
 d-i netcfg/disable_autoconfig boolean false
 {% else %}
diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index 9d0b13ee..f4b0fff1 100644
--- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -14,7 +14,7 @@ d-i keyboard-configuration/layoutcode string us
 d-i hw-detect/load_firmware boolean false
 
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
-{% if install_dhcp is defined and install_dhcp %}
+{% if 'install_dhcp' in hostvars[hostname] and hostvars[hostname].install_dhcp %}
 d-i netcfg/disable_dhcp boolean false
 d-i netcfg/disable_autoconfig boolean false
 {% else %}
diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index 9e18c2ee..7d053a5d 100644
--- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -14,7 +14,7 @@ d-i keyboard-configuration/layoutcode string us
 d-i hw-detect/load_firmware boolean false
 
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
-{% if install_dhcp is defined and install_dhcp %}
+{% if 'install_dhcp' in hostvars[hostname] and hostvars[hostname].install_dhcp %}
 d-i netcfg/disable_dhcp boolean false
 d-i netcfg/disable_autoconfig boolean false
 {% else %}
diff --git a/roles/vm/host/tasks/main.yml b/roles/vm/host/tasks/main.yml
index 6a966464..f83b7d0b 100644
--- a/roles/vm/host/tasks/main.yml
+++ b/roles/vm/host/tasks/main.yml
@@ -8,6 +8,7 @@
       - python-libvirt
       - haveged
       - bridge-utils
+      - acl
     state: present
 
 - name: configure haveged
diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index a15e2a47..e7e5cf1a 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -43,7 +43,7 @@
       wait_for_virt:
         name: "{{ hostname }}"
         states: shutdown,crashed
-        timeout: 900
+        timeout: 1800
       register: installer_result
       failed_when: installer_result.failed or installer_result.state == "crashed"