improve zfs pool init support

9 files changed, 10 insertions, 10 deletions

diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml
index 5ce6325f..b45e3b24 100644
--- a/inventory/host_vars/ch-oulu.yml
+++ b/inventory/host_vars/ch-oulu.yml
@@ -44,7 +44,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 8 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   nvme:
     mountpoint: /srv/nvme
     create_vdevs: mirror /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800161Z-part4 /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800191M-part4
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index 18cb88e9..d55d2c87 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -72,7 +72,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 24 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   nvme:
     mountpoint: /srv/nvme
     create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index b9a0fdb6..c634a7c1 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -53,7 +53,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 4 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
     create_vdevs: /dev/disk/by-id/ata-WDC_WD5000LPVX-22V0TT0_WD-WX81AB371127-part1
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index 6f974993..5259a390 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -44,7 +44,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 12 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
     create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index a131189c..173c89e8 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -44,7 +44,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 8 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
     create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index 38bd7cfb..fb390f3c 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -38,7 +38,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 12 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
     create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1
diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml
index a98bbccf..4492d1c9 100644
--- a/inventory/host_vars/sk-cloudio/vars.yml
+++ b/inventory/host_vars/sk-cloudio/vars.yml
@@ -26,10 +26,10 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 16 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
-    create_vdevs: mirror nvme0n1p3 nvme1n1p3
+    create_vdevs: mirror /dev/nvme0n1p3 /dev/nvme1n1p3
 
 zfs_sanoid_modules:
   storage/nextcloud:
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index efa63f4b..6d46dc27 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -47,7 +47,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 8 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
     create_vdevs: /dev/sdb
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index 410a1d29..718a9285 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -44,7 +44,7 @@ zfs_arc_size:
   min: "{{ 2 * 1024 * 1024 * 1024 }}"
   max: "{{ 8 * 1024 * 1024 * 1024 }}"
 
-zfs_zpools:
+zfs_pools:
   storage:
     mountpoint: /srv/storage
     create_vdevs: mirror /dev/mapper/crypto-nvme0 /dev/mapper/crypto-nvme1