From 27c9986590371d4b706ddb7d5628bef0f4b8b2bc Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 14 Dec 2019 01:57:03 +0100
Subject: some more tests for openbsd install

---
 roles/vm/define/tasks/main.yml                  |  1 -
 roles/vm/define/templates/libvirt-domain.xml.j2 |  9 ++++++--
 roles/vm/install/meta/main.yml                  | 12 +++++-----
 roles/vm/install/tasks/main.yml                 | 30 ++++++++++++-------------
 4 files changed, 28 insertions(+), 24 deletions(-)

(limited to 'roles')

diff --git a/roles/vm/define/tasks/main.yml b/roles/vm/define/tasks/main.yml
index 202644dd..4c2b99e1 100644
--- a/roles/vm/define/tasks/main.yml
+++ b/roles/vm/define/tasks/main.yml
@@ -23,7 +23,6 @@
         name: "{{ hostname }}"
         command: undefine
 
-
 - name: define vm
   virt:
     command: define
diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2
index c7e3a2f2..a6aea91c 100644
--- a/roles/vm/define/templates/libvirt-domain.xml.j2
+++ b/roles/vm/define/templates/libvirt-domain.xml.j2
@@ -42,11 +42,16 @@
     </rng>
 
 {% if vm_define_installer and install_distro == 'openbsd' %}
-    <disk type='block' device='cdrom'>
-      <driver name='qemu' type='raw'/>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu'/>
       <source file='{{ installer_path }}/openbsd-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/install.iso'/>
       <target dev='hdc' bus='ide'/>
+      <readonly/>
     </disk>
+
+    <graphics type='vnc' port='5904' sharePolicy='allow-exclusive'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
 {% endif %}
 
 {% if 'virtio' in hostvars[hostname].install_cooked.disks %}
diff --git a/roles/vm/install/meta/main.yml b/roles/vm/install/meta/main.yml
index 710f90ad..347e30c4 100644
--- a/roles/vm/install/meta/main.yml
+++ b/roles/vm/install/meta/main.yml
@@ -1,7 +1,7 @@
 ---
-dependencies:
-  - role: installer/debian
-    distros:
-      - distro: "{{ install_distro }}"
-        codename: "{{ install_codename }}"
-        arch: [ "{{ hostvars[hostname].install_cooked.arch | default('amd64') }}" ]
+# dependencies:
+#   - role: installer/debian
+#     distros:
+#       - distro: "{{ install_distro }}"
+#         codename: "{{ install_codename }}"
+#         arch: [ "{{ hostvars[hostname].install_cooked.arch | default('amd64') }}" ]
diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index 162ece24..10b10e18 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -28,22 +28,22 @@
         state: directory
       register: tmpdir
 
-    - import_role:
-        name: preseed
-      vars:
-        ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
-        preseed_tmpdir: "{{ tmpdir.path }}"
-        preseed_force_net_ifnames_policy: path
-        preseed_no_netplan: yes
-        install_interface: enp1s1
+    # - import_role:
+    #     name: preseed
+    #   vars:
+    #     ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
+    #     preseed_tmpdir: "{{ tmpdir.path }}"
+    #     preseed_force_net_ifnames_policy: path
+    #     preseed_no_netplan: yes
+    #     install_interface: enp1s1
 
-    - name: Make preseed workdir readable by qemu
-      acl:
-        path: "{{ tmpdir.path }}"
-        state: present
-        entity: libvirt-qemu
-        etype: user
-        permissions: rx
+    # - name: Make preseed workdir readable by qemu
+    #   acl:
+    #     path: "{{ tmpdir.path }}"
+    #     state: present
+    #     entity: libvirt-qemu
+    #     etype: user
+    #     permissions: rx
 
     - import_role:
         name: vm/define
-- 
cgit v1.2.3