From 11115d515eda0e64a34c327c277b7948bbfc8f80 Mon Sep 17 00:00:00 2001
From: Michael Balsillie <michael@balsillie.net>
Date: Wed, 11 Jan 2023 15:19:15 +1000
Subject: [PATCH] move zfs_pools var

---
 ansible/inventory/group_vars/all/all.yaml     | 23 -------------------
 .../group_vars/k8s_storage/k8s_storage.yaml   | 23 +++++++++++++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/ansible/inventory/group_vars/all/all.yaml b/ansible/inventory/group_vars/all/all.yaml
index 86cb358..9ee09b0 100644
--- a/ansible/inventory/group_vars/all/all.yaml
+++ b/ansible/inventory/group_vars/all/all.yaml
@@ -13,26 +13,3 @@ zfs_packages:
   - zfs-dkms
   - smartmontools
 zfs_key_id: DDF7DB817396A49B2A2723F7403BD972F75D9D76
-zfs_pools:
-  - name: ssd
-    ashift: 16
-    recordsize: 64k
-    type: ""
-    disks: /dev/vde
-    compression: 'off'
-    datasets:
-      - name: ssd/data
-        encrypt: false
-      - name: ssd/data/open-ebs
-        encrypt: false
-  # - name: hdd
-  #   ashift: 12
-  #   type: mirror
-  #   disks: /dev/sda /dev/sdb
-  #   datasets:
-  #     - name: hdd
-  #       encrypt: false
-  #     - name: hdd/data
-  #       encrypt: true
-  #     - name: hdd/data/open-ebs
-  #       encrypt: false
\ No newline at end of file
diff --git a/ansible/inventory/group_vars/k8s_storage/k8s_storage.yaml b/ansible/inventory/group_vars/k8s_storage/k8s_storage.yaml
index cd21505..0949533 100644
--- a/ansible/inventory/group_vars/k8s_storage/k8s_storage.yaml
+++ b/ansible/inventory/group_vars/k8s_storage/k8s_storage.yaml
@@ -1,2 +1,25 @@
 ---
 
+zfs_pools:
+  - name: ssd
+    ashift: 16
+    recordsize: 64k
+    type: ""
+    disks: /dev/vde
+    compression: "off"
+    datasets:
+      - name: ssd/data
+        encrypt: false
+      - name: ssd/data/open-ebs
+        encrypt: false
+  - name: hdd
+    ashift: 12
+    recordsize: 64k
+    type: mirror
+    disks: /dev/sda /dev/sdb
+    compression: "off"
+    datasets:
+      - name: hdd/data
+        encrypt: true
+      - name: hdd/data/open-ebs
+        encrypt: false
\ No newline at end of file