Improvements

3 files changed, 50 insertions, 42 deletions

diff --git a/tasks/jails.yml b/tasks/jails.yml
index fe94126..58d22d8 100644
--- a/tasks/jails.yml
+++ b/tasks/jails.yml
@@ -11,52 +11,19 @@
     - { name: "zroot/jails", mountpoint: "/usr/local/jails" }
     - { name: "zroot/jails/media" }
     - { name: "zroot/jails/templates" }
-    - { name: "zroot/jails/templates/{{ jail_userland_version }}" }
+    - {
+        name: "zroot/jails/templates/{{ jail_userland_14_3 }}",
+        userland: "{{ jail_userland_14_3 }}",
+      }
+    - {
+        name: "zroot/jails/templates/{{ jail_userland_15_0 }}",
+        userland: "{{ jail_userland_15_0 }}",
+      }
     - { name: "zroot/jails/containers" }
   loop_control:
     loop_var: dataset
   include_tasks: jails_dataset.yml
 
-- name: Check if userland snapshot already exists
-  shell: zfs list -t snapshot -o name | grep -Fxq "zroot/jails/templates/{{ jail_userland_version }}@base"
-  failed_when: false
-  changed_when: false
-  register: zfs_userland_check
-
-- name: Set up userland
-  when: zfs_userland_check.rc != 0
-  block:
-    - name: Download userland
-      get_url:
-        url: https://download.freebsd.org/ftp/releases/amd64/amd64/{{ jail_userland_version }}/base.txz
-        dest: /usr/local/jails/media/{{ jail_userland_version }}-base.txz
-        owner: root
-        group: wheel
-        mode: "0644"
-
-    - name: Unarchive userland
-      shell: tar -xzf /usr/local/jails/media/{{ jail_userland_version }}-base.txz -C /usr/local/jails/templates/{{ jail_userland_version }}
-
-    - name: Copy localtime to jail userland
-      copy:
-        remote_src: true
-        src: /etc/localtime
-        dest: /usr/local/jails/templates/{{ jail_userland_version }}/etc/localtime
-
-    - name: Copy resolv.conf to jail userland
-      shell: |
-        cat /etc/resolv.conf > /usr/local/jails/templates/{{ jail_userland_version }}/etc/resolv.conf
-        chmod 644 /usr/local/jails/templates/{{ jail_userland_version }}/etc/resolv.conf
-
-    - name: Update userland to latest patch level
-      shell: freebsd-update -b /usr/local/jails/templates/{{ jail_userland_version }}/ fetch install
-
-    - name: Disable syslogd in the template
-      shell: echo 'syslogd_enable="NO"' >> /usr/local/jails/templates/{{ jail_userland_version }}/etc/rc.conf
-
-    - name: Create userland ZFS snapshot
-      shell: zfs snapshot zroot/jails/templates/{{ jail_userland_version }}@base
-
 - name: Configure jails
   block:
     - name: Configure jail.conf
diff --git a/tasks/jails_dataset.yml b/tasks/jails_dataset.yml
index 9466c46..c97e14a 100644
--- a/tasks/jails_dataset.yml
+++ b/tasks/jails_dataset.yml
@@ -12,3 +12,44 @@
     zfs create -p "{{ dataset.name }}"
     {% endif %}
   when: check_dataset_exists.rc != 0
+
+- name: Check if userland snapshot already exists
+  shell: zfs list -t snapshot -o name | grep -Fxq "{{ dataset.name }}@base"
+  failed_when: false
+  changed_when: false
+  register: zfs_userland_check
+  when: dataset.userland is defined
+
+- name: Set up userland
+  when: dataset.userland is defined and zfs_userland_check.rc != 0
+  block:
+    - name: Download userland
+      get_url:
+        url: https://download.freebsd.org/ftp/releases/amd64/amd64/{{ dataset.userland }}/base.txz
+        dest: /usr/local/jails/media/{{ dataset.userland }}-base.txz
+        owner: root
+        group: wheel
+        mode: "0644"
+
+    - name: Unarchive userland
+      shell: tar -xzf /usr/local/jails/media/{{ dataset.userland }}-base.txz -C /usr/local/jails/templates/{{ dataset.userland }}
+
+    - name: Copy localtime to jail userland
+      copy:
+        remote_src: true
+        src: /etc/localtime
+        dest: /usr/local/jails/templates/{{ dataset.userland }}/etc/localtime
+
+    - name: Copy resolv.conf to jail userland
+      shell: |
+        cat /etc/resolv.conf > /usr/local/jails/templates/{{ dataset.userland }}/etc/resolv.conf
+        chmod 644 /usr/local/jails/templates/{{ dataset.userland }}/etc/resolv.conf
+
+    - name: Update userland to latest patch level
+      shell: freebsd-update -b /usr/local/jails/templates/{{ dataset.userland }}/ fetch install
+
+    - name: Disable syslogd in the template
+      shell: echo 'syslogd_enable="NO"' >> /usr/local/jails/templates/{{ dataset.userland }}/etc/rc.conf
+
+    - name: Create userland ZFS snapshot
+      shell: zfs snapshot zroot/jails/templates/{{ dataset.userland }}@base
diff --git a/tasks/jails_single.yml b/tasks/jails_single.yml
index 043086d..274688b 100644
--- a/tasks/jails_single.yml
+++ b/tasks/jails_single.yml
@@ -5,7 +5,7 @@
   register: check_jail_directory
 
 - name: "ZFS clone snapshot to jail directory for {{ jail.name }}"
-  shell: zfs clone zroot/jails/templates/{{ jail_userland_version }}@base "zroot/jails/containers/{{ jail.name }}"
+  shell: zfs clone zroot/jails/templates/{{ jail.userland }}@base "zroot/jails/containers/{{ jail.name }}"
   when: check_jail_directory.rc != 0
 
 - name: Make resolv.conf immutable