refactor: storage roles

12 files changed, 71 insertions, 71 deletions

diff --git a/chaos-at-home/ch-apps.yml b/chaos-at-home/ch-apps.yml
index 447e9b0f..cbd39112 100644
--- a/chaos-at-home/ch-apps.yml
+++ b/chaos-at-home/ch-apps.yml
@@ -11,7 +11,7 @@
 - name: Payload Setup
   hosts: ch-apps
   roles:
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: apt-repo/spreadspace
   - role: nginx/base
diff --git a/chaos-at-home/ch-atlas.yml b/chaos-at-home/ch-atlas.yml
index d6025c95..4b934b87 100644
--- a/chaos-at-home/ch-atlas.yml
+++ b/chaos-at-home/ch-atlas.yml
@@ -12,7 +12,7 @@
 - name: Payload Setup
   hosts: ch-atlas
   roles:
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: vm/host/base
   - role: vm/host/network
diff --git a/chaos-at-home/ch-epimetheus.yml b/chaos-at-home/ch-epimetheus.yml
index d091ffc5..6d5046b3 100644
--- a/chaos-at-home/ch-epimetheus.yml
+++ b/chaos-at-home/ch-epimetheus.yml
@@ -14,8 +14,8 @@
   - role: apt-repo/spreadspace
   - role: nginx/base
   - role: monitoring/prometheus/exporter
-  - role: storage/luks/volumes
-  - role: storage/zfs/pools
+  - role: storage/luks/base
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: storage/zfs/syncoid
   post_tasks:
@@ -27,7 +27,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in luks_volumes.items() %}
+        {% for name, volume in luks_devices.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
@@ -45,7 +45,7 @@
       content: |
         #!/bin/bash
         {% set disk_variables = [] %}
-        {% for name,volume in luks_volumes.items() %}
+        {% for name,volume in luks_devices.items() %}
         disk_{{ name | replace('-', '_') }}=$(basename $(realpath '{{ volume.device }}'))
         {{ disk_variables.append('$disk_'+(name | replace('-', '_'))) -}}
         {% endfor %}
diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml
index d068c2f2..1afea864 100644
--- a/chaos-at-home/ch-equinox-t450s.yml
+++ b/chaos-at-home/ch-equinox-t450s.yml
@@ -27,7 +27,7 @@
   - role: apt-repo/kubernetes
   - role: apt-repo/element
   - role: apt-repo/kicad6
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: ws/base
   - role: core/admin-users
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index af438ee7..7869a46c 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -28,7 +28,7 @@
   - role: apt-repo/kubernetes
   - role: apt-repo/element
   - role: apt-repo/kicad6
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: ws/base
   - role: core/admin-users
diff --git a/chaos-at-home/ch-mimas.yml b/chaos-at-home/ch-mimas.yml
index 20d34bd0..3a01fdde 100644
--- a/chaos-at-home/ch-mimas.yml
+++ b/chaos-at-home/ch-mimas.yml
@@ -17,7 +17,7 @@
 - name: Payload Setup
   hosts: ch-mimas
   roles:
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: network/wireguard/base
   - role: network/wireguard/p2p
diff --git a/chaos-at-home/ch-mon.yml b/chaos-at-home/ch-mon.yml
index 9db514ec..bb0100c7 100644
--- a/chaos-at-home/ch-mon.yml
+++ b/chaos-at-home/ch-mon.yml
@@ -12,7 +12,7 @@
   hosts: ch-mon
   roles:
   - role: network/nftables/base
-  - role: storage/lvm/groups
+  - role: storage/lvm/base
   - role: nginx/base
   - role: apt-repo/spreadspace
   - role: nginx/auth/whawty-sso/base
diff --git a/chaos-at-home/ch-phoebe.yml b/chaos-at-home/ch-phoebe.yml
index c3fc2ddb..72a75fd5 100644
--- a/chaos-at-home/ch-phoebe.yml
+++ b/chaos-at-home/ch-phoebe.yml
@@ -12,7 +12,7 @@
 - name: Payload Setup
   hosts: ch-phoebe
   roles:
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: vm/host/base
   - role: vm/host/network
diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index c632a905..d7dc2e87 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -14,8 +14,8 @@
   - role: apt-repo/spreadspace
   - role: nginx/base
   - role: monitoring/prometheus/exporter
-  - role: storage/luks/volumes
-  - role: storage/zfs/pools
+  - role: storage/luks/base
+  - role: storage/zfs/base
   - role: storage/zfs/sanoid
   - role: chaos-at-home/fileserver
   - role: vm/host/base
@@ -31,7 +31,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in luks_volumes.items() %}
+        {% for name, volume in luks_devices.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
@@ -58,7 +58,7 @@
         disk_primary{{ loop.index0 }}=$(basename $(realpath '{{ disk }}'))
         {{ disk_variables.append('$disk_primary'+(loop.index0| string)) -}}
         {% endfor %}
-        {% for name,volume in luks_volumes.items() %}
+        {% for name,volume in luks_devices.items() %}
         {%   if 'crypto-nvme' not in name %}
         disk_{{ name | replace('-', '_') }}=$(basename $(realpath '{{ volume.device }}'))
         {{ disk_variables.append('$disk_'+(name | replace('-', '_'))) -}}
diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml
index 09ef44b1..3e54220e 100644
--- a/chaos-at-home/ch-telesto.yml
+++ b/chaos-at-home/ch-telesto.yml
@@ -12,7 +12,7 @@
 - name: Payload Setup
   hosts: ch-telesto
   roles:
-  - role: storage/zfs/pools
+  - role: storage/zfs/base
   - role: apt-repo/obs-studio
   - role: apt-repo/spreadspace
   - role: ws/base
diff --git a/chaos-at-home/host_vars/ch-epimetheus.yml b/chaos-at-home/host_vars/ch-epimetheus.yml
index 5066eb00..ff949409 100644
--- a/chaos-at-home/host_vars/ch-epimetheus.yml
+++ b/chaos-at-home/host_vars/ch-epimetheus.yml
@@ -1,26 +1,26 @@
 $ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-62613332303233633063356330383062393766363835313766306561303862303433366537323436
-3932326263373434393461316334376136373663613665660a646638643766396666363664633233
-36653531613830636263643363373761663266613731623038343137346161333561333631393364
-3632646262323566610a366233656466666538316262356162306536616437643565633237303466
-62623438326462356130666365373361646132366665626130376363303739623336356466303835
-33623961353235633635636137323839616566636633333064353237336332303335653966393833
-33643032653634623261656663663561626665626261376564666237353839663134343665646133
-37336330336234316637636633646366353937326331393662633166643338363265336633336566
-34363033323661366238386631363232353666313038323264633835343663643936326433353636
-30646666316435313232623166326233616535653066386433646364333435336236316461346362
-64373465646230613531626162323564363539303934393864336261633137646564616535666636
-66393935626562356438633364313833366363643337316136646439353739303162396435626666
-35653666663930636430396266316536303761313238396665333734646339303162373064653033
-39656161653662333330363134313231643764363233363832353364353864316430643330363332
-38313963303436343130316564386433623930626433393963643964386266356536613130383561
-36323636363066373936333032373665656635376639636231356365386365386263353537353839
-63613837376362303365303461383865643466343961633466623230376336636539333535333638
-66373233376562623461626334333034623231353665303739633463353464663031366638323163
-39616136336237323862343365636531343939316239363937623237343239643931396665316236
-39363233616466623039656365623736303535656161623062326263636235306663633734353963
-37663864373533333663643038613262663533356235326164363336386363613634303266353535
-32623062643437646339356239613038346634316266663733373538626262373536343831346137
-65356566633337383935626236333433313636323034666339633831323734353537303034343561
-39383838356332316163313732353831313838633632363230366665396534356236636364383836
-36653337623839323139653937633639623164313066643661316536346135666565
+36323937643837663230303261636363363765333335666336333930623830343033303030643664
+3762323439373663653736646230353938646461646565320a663139373139363762646532386536
+32343733656631626431396136373466386530663338393161343532636431343536376165613563
+3733306436616339650a326233613733393838663664663531623462353034646362643238333539
+31343263326364313532623264373463373234396635326637396536633339346165323236306238
+32393938313639323734653939633137656236623530356335616135303339393436353136633436
+37353131643538613433333530303330643961333761333030616235376566343538613661653138
+37666631363334353863366533353139613366353032303332353561613633376562356266633735
+38623535313530626435336666353036656234383832356265626665636162346462613131626632
+37396164323837636239396266366438376131303931663934306539333139323134666639356461
+35616534326336373335666461373566373562333139653161383430373731366335333134643864
+37353331363535346138343536643066663532363165613034616339396436653666343534623538
+33316163393036616461373131613164626639313031376632333338376230313935373332303435
+64393032353130626363323832323230636161356365303562343233363533303664633163636665
+61333863303238653865613836613864353035376433663664643031633161633233386231626262
+30326564613931393137653061643339326439616163623934663365303064616639343038303739
+63656263353030356165636239343237343236343962646238373333643165663231353461383039
+31663035653338663962303264366662613238383233623637353633363365333364353665366661
+62346531663961643765666265663330356534306363336635383235313330653835656664623261
+65333065393239303236386666656365393132386134336462313735363266353735333663383436
+64663939636637626661393666636233393637366530326535306165303332393139333539333661
+31306536373135393732366231623638666333636530373561373362373836333933373963343365
+39316637616439623539396132323436643932316436353731633861363434366231663731316330
+64363739366631656530376263353034626631386362383234356463616461393130643838346662
+31333139383532666533646665646434303764343865663234346539633866376262
diff --git a/chaos-at-home/host_vars/ch-prometheus.yml b/chaos-at-home/host_vars/ch-prometheus.yml
index beb1b843..584c2ff7 100644
--- a/chaos-at-home/host_vars/ch-prometheus.yml
+++ b/chaos-at-home/host_vars/ch-prometheus.yml
@@ -1,31 +1,31 @@
 $ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-35643462626632373337346566313532663132386432313535636562316661323938396531343262
-6335363735646638306562313466383138643237633034660a643962663461663464386661393039
-33623033386162366461616636666663356564636638363566306563363835626263303666363331
-3363376432643732610a613530646163633739383137636365333466666362373364623633396138
-39363866373465376665326638663363333330663434383463396132623863303632346564653062
-64336633633365663534616262373837623336626366386564336635363837313133323666303766
-39346237643863373038363865366638363164313263623834363331623566356662373735353536
-65623364376231336437653937306461623063393862626562613534663736303264386232666434
-30333635643765306339643462316230333436313732616238323538386262383439373862616235
-35656333373764633437303864383939643764396533383334323833343838366263353430343435
-37333239313135383930323439353531376637383165613163373430343632383666616432643661
-35643462633831333739623232666631393234363131636438363666313836666266373032633264
-62376333376537643831643464343466373632343635346365393362376566653931613137666537
-31623531663661363836663239393535653032373639386236343632383663313162616261626436
-31643964343131383138343739313335656439613134613865343664643833376265333639326338
-39343236326437623036613937306632616564623933396634316432363161663030373130383733
-30613264636364646665386230346430333764656464666136303965346132656437383736393734
-32633533396535656563383638616366663934653363343331626234623935326332626539383361
-34373337356136636666623965636637396164663131383438333334386237336334333034373138
-65326265343364613163323561633038313335323730333662653433303966623631323261333266
-36343266316166633663386365613565396261633930663135393430323665343765356439663362
-62646634613439326164343164373433313538626336626634633039636162656138633363353566
-39653536333230363037643632363062396135386239353734376465333031626463336337313262
-39373662383533333363313464383265313165326438356539663134646532636161663963316264
-66353632646662656539376463316139663730613434643861303961333965663361386663613534
-34346630616630323661643432393138393931356563363762306566346538353864306434343036
-61303431376664353536376666336430666162613638303261333562356561623162633439363763
-37373534323832623331376330363461326331656336336439623335353934356631643865373637
-35386661633434666562666135666532353333626364613631323865613339323839316362363261
-3461643536336537343064353464303731316239396530333039
+33363539373738373037653265363335653137323165663964383431343966346461633361376165
+3031373532393639393132666137656536343662306461650a363431316161363534653538653432
+36663537373365373661636264333030326365313233303137643639613261343561393066303333
+3837393138643733330a623634353164663738323565653561663564663861346466636437613664
+62613837343733613133366661656439326566393639383865383537333561393530656430373165
+61623664383136333065303766303538346464376235356463633863393732366663633962663939
+62353164663135666562386561376261373837636533306235316366653662373931646530316632
+62393866346537303735643230613439653465336461313464666331613437643863616532386661
+66353063366632636234363837313235336161633138366130306339623234306337333261646561
+38383764636266313530666635383335636432303835373335393031383361323337353533323736
+36386332613465366664306664643361626563613065386461343664356636616464383762303435
+36393935393939323861316539356434353335666332313738366435626238373930383337333531
+35353332346635343930356236363934306138313266613661636562356566373834353630346238
+34386337356630306132303237656636656539373366376365343030386666346136386661333330
+39376134643735386535323864336436316439313439366638666432363231336134643535356362
+31613963343133356533366638336466386437633335613466373637373030616166353535376437
+37613433363637363163623963316638336366383664353835613837393936363336613234336365
+33393639386364376561313234373939346365326161643738373933393066646533353139363664
+64363938303334336234613862343437383863666335383261363933383938356662303864643936
+65663239633331396636616537313161643337653830626661343366376533373061306231366261
+39356461323563633036396463333930653464353666633532653635303934616130626435316161
+32643438643164313934616435383932353733626162326538356666326439343032373435616335
+30643165373761646232633662343662326438373632663338356330623336626232636135353461
+61656135343533326265353964323536383639626463623035663662383266323337323932353334
+31623262326138333130326162663937646633643738313130393932396162663336646362626266
+38373238666665636636383131323132623164613461626631303835343763646131643862386564
+32313962616337646134356165303164623833623535653164653565313866666361333533636561
+35363039316534643434336664626631666138633964656238666234343837373862366230356633
+31616535313063316138333130363135653336643336323863383638373563623036373566643638
+6261386131653739666263666635306138356130356539643434