X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fvm-install.yml;h=e0685f9d36b5c77582d51ee507caf201afed38ef;hb=320cd6f207345a4101fe4f353d86d3a66a6eabd3;hp=e82aa33cb5b64600995264e09f7c3c2216569813;hpb=cada7766cb94b291b214784fa717f874db922d57;p=noc.git

diff --git a/ansible/vm-install.yml b/ansible/vm-install.yml
index e82aa33..e0685f9 100644
--- a/ansible/vm-install.yml
+++ b/ansible/vm-install.yml
@@ -1,18 +1,43 @@
 ---
-- name: Basic Installation
+- name: preperations and sanity checks
   hosts: "{{ vmname }}"
   gather_facts: no
-  pre_tasks:
-  - name: Gather facts of vm host
-    setup:
-    delegate_to: "{{ vm_install.host }}"
-    delegate_facts: yes
+  tasks:
+  - name: setup variables
+    set_fact:
+      vm_network_cooked: "{{ vm_network }}"
+      vm_install_cooked: "{{ vm_install }}"
+  - name: create temporary host group for vm host
+    add_host:
+      name: "{{ vm_install.host }}"
+      inventory_dir: "{{inventory_dir}}"
+      group: _vmhost_
+  # TODO: add some sanity checks
+
+- name: basic installation
+  hosts: _vmhost_
   roles:
-  - role: vm-install
+  - role: vm/install
+
+- name: wait for new vm to start up
+  hosts: "{{ vmname }}"
+  gather_facts: no
+  tasks:
+    ## TODO: find a better way to fetch host key of new VMs
+  - name: disable ssh StrictHostKeyChecking for the next step
+    set_fact:
+      ansible_ssh_extra_args: -o StrictHostKeyChecking=no
+  - name: wait for vm to start up
+    wait_for_connection:
+      delay: 5
+      timeout: 120
+  - name: reenable StrictHostKeyChecking
+    set_fact:
+      ansible_ssh_extra_args: ""
 
 - import_playbook: "host_playbooks/{{ vmname }}.yml"
 
-- name: Reboot and wait for VM come back
+- name: reboot and wait for VM come back
   hosts: "{{ vmname }}"
   gather_facts: no
   roles: