From 0b25de101de1cc1a43ae47edfd89d43ae28a642d Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 26 Dec 2019 14:41:44 +0100
Subject: openbsd installer runs thtrough now

---
 inventory/group_vars/openbsd/main.yml              |  2 ++
 inventory/hosts.ini                                |  4 ++++
 roles/installer/openbsd/autoinstall/tasks/main.yml | 10 +++++-----
 roles/vm/install/tasks/main.yml                    |  9 +++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 inventory/group_vars/openbsd/main.yml

diff --git a/inventory/group_vars/openbsd/main.yml b/inventory/group_vars/openbsd/main.yml
new file mode 100644
index 00000000..913008d0
--- /dev/null
+++ b/inventory/group_vars/openbsd/main.yml
@@ -0,0 +1,2 @@
+---
+ansible_python_interpreter: /usr/local/bin/python3.7
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 4847c64a..3892abbe 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -180,6 +180,10 @@ r3-cccamp19-sw0
 chaos-at-home-switches
 
 
+[openbsd]
+ch-router-obsd
+
+
 [kvmhosts]
 ch-atlas
 ch-gnocchi
diff --git a/roles/installer/openbsd/autoinstall/tasks/main.yml b/roles/installer/openbsd/autoinstall/tasks/main.yml
index a4e63f3f..cb9975de 100644
--- a/roles/installer/openbsd/autoinstall/tasks/main.yml
+++ b/roles/installer/openbsd/autoinstall/tasks/main.yml
@@ -56,8 +56,8 @@
   args:
     chdir: "{{ obsd_autoinstall_tmpdir }}/"
 
-# - print instructions
-#     * attach to console
-#     * select (S)hell
-#     * # mount_cd9660 /dev/cd0c /mnt && cp /mnt/etc/auto_install.conf / && autoinstall
-#
+- name: set additional installer info
+  set_fact:
+    installer_manual_steps_msg: |
+      * at the installer prompt select: (S)hell
+      * # mount_cd9660 /dev/cd0c /mnt && cp /mnt/etc/auto_install.conf / && autoinstall
diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index ab94d4e5..bc31967a 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -62,6 +62,15 @@
     - debug:
         msg: "you can check on the status of the installer running this command 'virsh console {{ hostname }}' on host {{ inventory_hostname }}."
 
+    - when: installer_manual_steps_msg is defined
+      pause:
+        prompt: |
+          Mind that this installer needs manual steps to be performed:
+
+            {{ installer_manual_steps_msg | indent(2) }}
+
+          When done press enter to continue or Ctrl-C + 'A' to abort.
+
     - name: wait for installer to finish or crash
       wait_for_virt:
         name: "{{ hostname }}"
-- 
cgit v1.2.3