From 74d9ce61bb0b2d65043c08cd8c4711d1474219bf Mon Sep 17 00:00:00 2001
From: binary <me@rgoncalves.se>
Date: Tue, 19 Jan 2021 22:44:27 +0100
Subject: Add iso download and simplify url variables

---
 roles/bhyve/tasks/main.yml |  8 ++++++--
 roles/bhyve/vars/main.yml  | 14 ++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'roles/bhyve')

diff --git a/roles/bhyve/tasks/main.yml b/roles/bhyve/tasks/main.yml
index 039ba10..1b7470f 100644
--- a/roles/bhyve/tasks/main.yml
+++ b/roles/bhyve/tasks/main.yml
@@ -62,6 +62,12 @@
   include: guest.yml guest="{{ item }}"
   loop: "{{ vms }}"
 
+- name: retrieve all iso
+  get_url:
+    url: "{{ item }}"
+    dest: "{{ bhyve_dir }}/.iso"
+  loop: "{{ bhyve_iso }}"
+
 - name: retrieve all deprecated vms
   find:
     path: "{{ bhyve_dir }}"
@@ -77,5 +83,3 @@
     - "{{ vms }}"
     - "{{ deprecated_vms.files }}"
 
-- name: ensure all vms are started
-  shell: vm startall
diff --git a/roles/bhyve/vars/main.yml b/roles/bhyve/vars/main.yml
index 51813f5..bb78f0d 100644
--- a/roles/bhyve/vars/main.yml
+++ b/roles/bhyve/vars/main.yml
@@ -10,16 +10,6 @@ bhyve_group: "bhyve"
 bhyve_bootdelay: "3"
 
 bhyve_iso:
-
-    - name: "alpine"
-      version: "3.12.1"
-      versiondir: "3.12"
-      url: "http://dl-cdn.alpinelinux.org/alpine/vVERSIONDIR/releases/x86_64/alpine-virt-VERSION-x86_64.iso"
-      sha256: "http://dl-cdn.alpinelinux.org/alpine/vVERSIONDIR/releases/x86_64/alpine-virt-VERSION-x86_64.iso.sha256"
-
-    - name: "openbsd"
-      version: "68"
-      versiondir: "6.8"
-      url: "https://cdn.openbsd.org/pub/OpenBSD/VERSIONDIR/amd64/installVERSION.img"
-      sha256: "d3603291fa50bcf056fa304acf9311556331598f31dfbbbc6797ae88f43c948b"
+  - https://dl-cdn.alpinelinux.org/alpine/v3.13/releases/x86_64/alpine-virt-3.13.0-x86_64.iso
+  - https://cdn.openbsd.org/pub/OpenBSD/6.8/amd64/cd68.iso
 
-- 
cgit v1.2.3