From 35cf0966c3a3ab5bd519bf7a0ecc2fb9b4efea9f Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 15 Jun 2020 00:09:58 +0200
Subject: zfs backed vm volumes: improved property handling

---
 roles/vm/host/tasks/zfs.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'roles/vm/host/tasks/zfs.yml')

diff --git a/roles/vm/host/tasks/zfs.yml b/roles/vm/host/tasks/zfs.yml
index b88ee73e..b84f2d0d 100644
--- a/roles/vm/host/tasks/zfs.yml
+++ b/roles/vm/host/tasks/zfs.yml
@@ -2,14 +2,15 @@
 - name: create zfs base datasets
   loop: "{{ lookup('dict', vm_host.zfs, wantlist=True)  }}"
   loop_control:
-    label: "{{ item.key }} -> {{ item.value.pool }}/{{ item.value.name }}{% if 'quota' in item.value %}={{ item.value.quota }}{% endif %}"
+    label: "{{ item.key }} -> {{ item.value.pool }}/{{ item.value.name }} ({{ (item.value.properties | default({})).items() | map('join', '=') | join(', ') }})"
+  vars:
+    default_properties:
+      canmount: no
+      mountpoint: none
   zfs:
     name: "{{ item.value.pool }}/{{ item.value.name }}"
     state: present
-    extra_zfs_properties:
-      quota: "{{ item.value.quota | default(omit) }}"
-      canmount: no
-      mountpoint: none
+    extra_zfs_properties: "{{ default_properties | combine(item.value.properties | default({})) }}"
 
 - name: configure lvm to ignore zfs volumes
   lineinfile:
-- 
cgit v1.2.3