fixup! base: Manage /etc/apt/sources.list

[noc.git] / ansible / vm-install.yml

diff --git a/ansible/vm-install.yml b/ansible/vm-install.yml
index 9e7f055..bbaf160 100644 (file)
--- a/ansible/vm-install.yml
+++ b/ansible/vm-install.yml
@@ -5,11 +5,11 @@
   tasks:
   - name: setup variables
     set_fact:
-      vm_network_cooked: "{{ vm_network }}"
-      vm_install_cooked: "{{ vm_install }}"
+      network_cooked: "{{ network }}"
+      install_cooked: "{{ install }}"
   - name: create temporary host group for vm host
     add_host:
-      name: "{{ vm_install.host }}"
+      name: "{{ vm_host }}"
       inventory_dir: "{{inventory_dir}}"
       group: _vmhost_
   # TODO: add some sanity checks
@@ -39,13 +39,14 @@
 
 - name: Apply VM configuration roles
   hosts: "{{ hostname }}"
+  pre_tasks:
+  - name: make sure to update cached facts
+    setup:
   roles:
   - role: vm/grub
   - role: vm/network
   - role: vm/guest
 
-- import_playbook: "host_playbooks/{{ hostname }}.yml"
-
 - name: reboot and wait for VM come back
   hosts: "{{ hostname }}"
   gather_facts: no
@@ -53,3 +54,5 @@
   - role: reboot-and-wait
     reboot_delay: 10
     reboot_timeout: 120
+
+- import_playbook: "host_playbooks/{{ hostname }}.yml"