From 77328526cf59b3b16d0e398c9cca24da41096542 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 10 Jul 2020 22:38:14 +0200
Subject: openbsd installer: move to single version per invocation

---
 roles/installer/openbsd/base/defaults/main.yml | 13 +++------
 roles/installer/openbsd/base/tasks/main.yml    | 37 +++++++++-----------------
 roles/installer/openbsd/base/vars/main.yml     |  7 +++++
 3 files changed, 23 insertions(+), 34 deletions(-)
 create mode 100644 roles/installer/openbsd/base/vars/main.yml

(limited to 'roles/installer')

diff --git a/roles/installer/openbsd/base/defaults/main.yml b/roles/installer/openbsd/base/defaults/main.yml
index 10e9c840..eeeaf2d0 100644
--- a/roles/installer/openbsd/base/defaults/main.yml
+++ b/roles/installer/openbsd/base/defaults/main.yml
@@ -1,13 +1,6 @@
-openbsd_versions:
-  - version: 6.7
-    arch:
-      - amd64
-      - i386
-
-openbsd_signing_keys:
-  6.7: |
-    untrusted comment: openbsd 6.7 base public key
-    RWRmkIA877Io3oCILSZoJGhAswifJbFK4r18ICoia+3c0PfwANueolNj
+---
+# openbsd_installer_version: 6.7
+openbsd_installer_arch: amd64
 
 openbsd_installer_force_download: no
 openbsd_installer_url: "https://cdn.openbsd.org/pub/OpenBSD"
diff --git a/roles/installer/openbsd/base/tasks/main.yml b/roles/installer/openbsd/base/tasks/main.yml
index 2d6e905e..df3db107 100644
--- a/roles/installer/openbsd/base/tasks/main.yml
+++ b/roles/installer/openbsd/base/tasks/main.yml
@@ -7,46 +7,35 @@
     state: present
 
 - name: prepare directories for installer iso files
-  loop: "{{ openbsd_versions | subelements('arch') }}"
-  loop_control:
-    label: "openbsd-{{ item.0.version }} {{ item.1 }}"
   file:
-    name: "{{ installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}"
+    name: "{{ installer_path }}/openbsd-{{ openbsd_installer_version }}/{{ openbsd_installer_arch }}"
     state: directory
 
 - name: download installer iso files
-  loop: "{{ openbsd_versions | subelements('arch') }}"
-  loop_control:
-    label: "openbsd-{{ item.0.version }} {{ item.1 }}"
   get_url:
-    url: "{{ openbsd_installer_url }}/{{ item.0.version }}/{{ item.1 }}/install{{ item.0.version | replace('.', '') }}.iso"
-    dest: "{{ installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}/install{{ item.0.version | replace('.', '') }}.iso"
+    url: "{{ openbsd_installer_url }}/{{ openbsd_installer_version }}/{{ openbsd_installer_arch }}/install{{ openbsd_installer_version_short }}.iso"
+    dest: "{{ installer_path }}/openbsd-{{ openbsd_installer_version }}/{{ openbsd_installer_arch }}/install{{ openbsd_installer_version_short }}.iso"
     mode: 0644
     force: "{{ openbsd_installer_force_download }}"
 
 - name: download signed sha256 files
-  loop: "{{ openbsd_versions | subelements('arch') }}"
-  loop_control:
-    label: "openbsd-{{ item.0.version }} {{ item.1 }}"
   get_url:
-    url: "{{ openbsd_installer_url }}/{{ item.0.version }}/{{ item.1 }}/SHA256.sig"
-    dest: "{{ installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}/SHA256.sig"
+    url: "{{ openbsd_installer_url }}/{{ openbsd_installer_version }}/{{ openbsd_installer_arch }}/SHA256.sig"
+    dest: "{{ installer_path }}/openbsd-{{ openbsd_installer_version }}/{{ openbsd_installer_arch }}/SHA256.sig"
     mode: 0644
     force: "{{ openbsd_installer_force_download }}"
 
 - name: create signing key files
-  loop: "{{ openbsd_versions }}"
-  loop_control:
-    label: "openbsd-{{ item.version }}"
   copy:
-    content: "{{ openbsd_signing_keys[item.version] }}"
-    dest: "{{ installer_path }}/openbsd-{{ item.version }}/openbsd-{{ item.version | replace('.', '') }}-base.pub"
+    content: "{{ openbsd_installer_signing_keys[openbsd_installer_version] }}"
+    dest: "{{ installer_path }}/openbsd-{{ openbsd_installer_version }}/openbsd-{{ openbsd_installer_version_short }}-base.pub"
 
 - name: verfiy downloaded iso files
-  loop: "{{ openbsd_versions | subelements('arch') }}"
-  loop_control:
-    label: "openbsd-{{ item.0.version }} {{ item.1 }}"
-  command: "signify-openbsd -Cp ../openbsd-{{ item.0.version | replace('.', '') }}-base.pub -x SHA256.sig install{{ item.0.version | replace('.', '') }}.iso"
+  command: "signify-openbsd -Cp ../openbsd-{{ openbsd_installer_version_short }}-base.pub -x SHA256.sig install{{ openbsd_installer_version_short }}.iso"
   args:
-    chdir: "{{ installer_path }}/openbsd-{{ item.0.version }}/{{ item.1 }}"
+    chdir: "{{ installer_path }}/openbsd-{{ openbsd_installer_version }}/{{ openbsd_installer_arch }}"
   changed_when: false
+  register: openbsd_installer_signify_result
+
+- debug:
+    var: openbsd_installer_signify_result.stdout_lines
diff --git a/roles/installer/openbsd/base/vars/main.yml b/roles/installer/openbsd/base/vars/main.yml
new file mode 100644
index 00000000..dad9f064
--- /dev/null
+++ b/roles/installer/openbsd/base/vars/main.yml
@@ -0,0 +1,7 @@
+---
+openbsd_installer_version_short: "{{ openbsd_installer_version | replace('.', '') }}"
+
+openbsd_installer_signing_keys:
+  "6.7": |
+    untrusted comment: openbsd 6.7 base public key
+    RWRmkIA877Io3oCILSZoJGhAswifJbFK4r18ICoia+3c0PfwANueolNj
-- 
cgit v1.2.3