From d9687ede9928eb8ec6a7b3ff238f7b9fd319a670 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 23 Aug 2020 01:56:46 +0200
Subject: revamp installer playbooks and add ch-apps vm

---
 common/vm-install.yml | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'common/vm-install.yml')

diff --git a/common/vm-install.yml b/common/vm-install.yml
index 64f4d696..5084ba0b 100644
--- a/common/vm-install.yml
+++ b/common/vm-install.yml
@@ -1,5 +1,5 @@
 ---
-- name: preperations and sanity checks
+- name: preparations and sanity checks
   hosts: "{{ install_hostname }}"
   gather_facts: no
   tasks:
@@ -30,47 +30,39 @@
   - role: vm/guest/install
 
 
-- name: wait for new vm to start up
+- name: wait for new machine to start up, apply early roles and reboot
   hosts: "{{ install_hostname }}"
   gather_facts: no
-  tasks:
+  pre_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
+      ansible_ssh_extra_args: "-o StrictHostKeyChecking=no{% if install_jumphost is defined %} -o 'ProxyCommand ssh -q -a {{ install_jumphost }} -W %h:%p'{% endif %}"
 
   - name: clear all gathered facts
     meta: clear_facts
-
-  - name: wait for vm to start up
+  - name: wait for host to start up
     wait_for_connection:
       delay: 5
       timeout: 120
-
-  - name: reenable StrictHostKeyChecking
-    set_fact:
-      ansible_ssh_extra_args: ""
-
-
-- name: apply basic VM configuration roles
-  hosts: "{{ install_hostname }}"
-  pre_tasks:
   - name: make sure to update cached facts
     setup:
+
   roles:
   - role: vm/guest/network
     when: install_distro in ['debian', 'ubuntu']
   - role: vm/guest/base
     when: install_distro in ['debian', 'ubuntu']
-
-- name: reboot and wait for VM to come back
-  hosts: "{{ install_hostname }}"
-  gather_facts: no
-  roles:
   - role: reboot-and-wait
     reboot_delay: 10
     reboot_timeout: 120
 
+  post_tasks:
+  - name: reenable StrictHostKeyChecking
+    set_fact:
+      ansible_ssh_extra_args: ""
+
+
 - name: run host playbook
   vars:
     params:
-- 
cgit v1.2.3