X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fvm-install.yml;h=bbaf160d6d295d0d7985b32b4b06bba2b2dc90f9;hb=9cceb22586401c6adb75b864953b369d13873f84;hp=507906f5745d39a88ca13b4bf3c8e0cecef9eeb4;hpb=53b7c937716d3ef523874a4cb3812fa8ba86dc2b;p=noc.git

diff --git a/ansible/vm-install.yml b/ansible/vm-install.yml
index 507906f..bbaf160 100644
--- a/ansible/vm-install.yml
+++ b/ansible/vm-install.yml
@@ -1,15 +1,15 @@
 ---
 - name: preperations and sanity checks
-  hosts: "{{ vmname }}"
+  hosts: "{{ hostname }}"
   gather_facts: no
   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
@@ -22,7 +22,7 @@
   - role: vm/install
 
 - name: wait for new vm to start up
-  hosts: "{{ vmname }}"
+  hosts: "{{ hostname }}"
   gather_facts: no
   tasks:
     ## TODO: find a better way to fetch host key of new VMs
@@ -38,18 +38,21 @@
       ansible_ssh_extra_args: ""
 
 - name: Apply VM configuration roles
-  hosts: "{{ vmname }}"
+  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/{{ vmname }}.yml"
-
 - name: reboot and wait for VM come back
-  hosts: "{{ vmname }}"
+  hosts: "{{ hostname }}"
   gather_facts: no
   roles:
   - role: reboot-and-wait
     reboot_delay: 10
     reboot_timeout: 120
+
+- import_playbook: "host_playbooks/{{ hostname }}.yml"