move cryptdisk role to new storage subdir

17 files changed, 150 insertions, 152 deletions

diff --git a/chaos-at-home/ch-epimetheus.yml b/chaos-at-home/ch-epimetheus.yml
index f1c567dd..ea1b5617 100644
--- a/chaos-at-home/ch-epimetheus.yml
+++ b/chaos-at-home/ch-epimetheus.yml
@@ -8,7 +8,7 @@
   - role: core/zsh
   - role: core/ntp
   - role: network/wakeonlan
-  - role: cryptdisk
+  - role: storage/luks/volumes
   - role: zfs/base
   - role: apt-repo/spreadspace
   - role: zfs/sanoid
@@ -37,7 +37,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in  cryptdisk_volumes.items() %}
+        {% for name, volume in  luks_volumes.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index 4ecc415e..4d6563d4 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -7,7 +7,7 @@
   - role: core/sshd
   - role: core/zsh
   - role: core/cpu-microcode
-  - role: cryptdisk
+  - role: storage/luks/volumes
   - role: zfs/base
   - role: apt-repo/spreadspace
   - role: zfs/sanoid
@@ -25,7 +25,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in  cryptdisk_volumes.items() %}
+        {% for name, volume in  luks_volumes.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
diff --git a/chaos-at-home/host_vars/ch-epimetheus.yml b/chaos-at-home/host_vars/ch-epimetheus.yml
index d1059a8f..5066eb00 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
-61666465336530396664363230656666656539666232626134383134336666623431623138626531
-3936333933393634396361326632626639383266643063610a643838303433373433646166323766
-34656362633630333663613563633066643531663339373534346238383863323339336365343932
-3435613663303062620a386338363932653238386534336161396535323533666638613466326134
-32646161663366363731366464386130306131383837363032386564316531323231386264323531
-33363831313662633830313638356565383638616530666161303433373831656130316261326265
-39316131643264303336393931346430613839323435653333396137666636333237616332336362
-64393762613063623935353431323732316131306364343338643436356632633033386530383330
-36326331323163323138393038633065633636396230386564336533656266633462633162363637
-38646638663863373437656138383862626163313139333961303266633330313738633461633636
-30653538383131616265623966626633313763663434343061386331653530343235346230623231
-33656435663536663965393063383666343735383762633961346437383066393739623437303365
-32643333383733323162613538396235373630313339653137613831326135626463373362346232
-35613863386639353330306338363264613961623863303061393766373730626535356666383236
-66366361616533613532323933323361633133336538363337633862643230336364336333656433
-64353563383630336364366135613463376435393262633934613539386633376663643463353561
-32626634623838313231623766373734383761663239356334343538666363373766646536313266
-34333130613435363065346265346565383062383962316366363436613538326632653861393764
-61336235336435313662336637633931636135383663393963396564303739333265313933326232
-39393934333330666433616237633865653637616439326333366534343532656333366436306532
-35353237373830373538346161333530393637326430333466303539633439356233333065623434
-61323364313734623930333233663431616463613635616261343230633362323436313663613431
-32616462316630633639613561313737346162633432343966383864323661666266626433356534
-66306566383961653031646563363935376464646339316665343538323431353631303930643863
-30363535346463333834303935653332366137633264616364356365343531623038
+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
diff --git a/chaos-at-home/host_vars/ch-prometheus.yml b/chaos-at-home/host_vars/ch-prometheus.yml
index 75a7cd05..beb1b843 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
-37393662663666326639313062363238666161313534646136626436613035633838616331376563
-6364653261643633373530643530616263643464336438620a396230313933343465323731306164
-30326630323136346165373532353062623731306436346330373065643736653063356532643363
-3664623638613265660a613165353566353332396463343838643233326131373639616138663739
-32626233393363396639373136343932373365313531613434653539356238613033346130323537
-34373739393734616239656264373437363836613935303464326265353233383265386366303863
-32373433363861383161616564646331616134316335393936623839613361343835653534353532
-65633864623230643832666630653237366365623065333065643861633333396535346334353466
-63643464333563326363323334323533363165333533333335303862343466376631303737646331
-38326439303332396638396362316431626564376433613761393364336331356430316535363736
-62633562633538613662393837653037333261616531666338666430393038666164623330326536
-37373135353533393435313131623761363831373832336163333334336164393436353934636565
-34363338343566626530626265356437643436373738643634356133316636353062303566653665
-64666339313761396366353436313136663038666163383033616637303163616338636439613965
-35363335653434393237313135346238323364323033613966663533313462663437383136383237
-33323839383733366365323439666466346266323939386331646262373763326365666164663330
-61623537633038396663376337616163303666303264656432326137373237663564313237623163
-39383765613337633736633533383931356234356339663930643031643663663962306462623062
-66393434313430383233663037373139653132323933663737623763333139383239373435636330
-34633165613865633163373962353937326139333538393162643031383333373161613762646635
-39646135396265666562343731626531336537303465306366653233623438383063326634366265
-35656130346135373839633732336566316166623834613465396534313665316536333161386639
-63346139306536653333633564386661303137333838656537303038343038303365396138373463
-62353035633535353536383631313434303035336233313934633533626338623938666336356161
-61653236303134663136343336353161393063656630366262633738343936633935373335326466
-61383830653437356364383564366336336535383264393636343831643436646464373530376633
-31363234366239643766653139646535303463343434313335643639653135623935333163666337
-61373366343166356432306432373662306335383664383838653136626530383863626134383064
-66646633366233333332653537616366393938356565633435646134636562393233343338616337
-6237393166666531653466393337323161636664326263626130
+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
diff --git a/dan/host_vars/sk-2019.yml b/dan/host_vars/sk-2019.yml
index 67ff3aac..6a508147 100644
--- a/dan/host_vars/sk-2019.yml
+++ b/dan/host_vars/sk-2019.yml
@@ -1,21 +1,21 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-35663165356437306532343566613137663338643139326330623135623134326539376639616138
-6539346263303561393339616133306131663233393536620a623939333832333263636338653435
-34386463316163363331303536323439373937303739613637613034363831633664353239653839
-6132313630376563350a663633333863626333306662613038373130386333353634376537613962
-65396539616130636239636264646263633338633263613537653465616330353163666364663432
-36653466393562383462633030316330346364663633653434663763376161333834326638616564
-32343563636333616633626534363865346662333862363939346664353461363862663066653264
-34396337643934386135303835373032306435626637303638353165636437353030363433373265
-33646636306163366334663037386633343233353138663061633830386136346236386630303037
-65363237346633346632653766326238333338323339643038346662386531326366353862333235
-36373566316166393439393831333136663933333939396561643566313039623832383365316164
-39633663346633323433393736303735323962653930313238336439353266353264626231653962
-65646135636433313534303633633365363261633232316466393735646361383437323935653931
-33356334653166373361303764356162303966323030366237663232343435376535623934633264
-61373233666664666436343964393066396632646164636366633833333565366232343536356331
-66353332346265663263386236643531633533643363326638396265353361303765636238643632
-61383137393665303064346531363339646164343831643130323437656166613336343632663338
-33626337326631396432326137383533373662643762326631313531313864363064356564366638
-66323066373737373662303833383862656333623864393665313234353133643838323737643161
-37383732306633666566
+31316530636334316661633331663365663637623361356663626564386563333937343064373762
+3231623665663231303431343233386537623637383663320a383935353539303334653766663566
+30343966343033643530626238343232623937643933646336346130363964393036323233613565
+3665616539373131380a346431383933373162343234633136393936643962303462373364386135
+64626135626361633535613539336561616430653035653234646634666162646133383631346666
+38326639623436653265643962363439343163643938653263393563326530373561643665356333
+38363535663338613437626436613662333039616239306663623936346366646337306663353463
+31373931353830333539366565383765333232643836646461326633343363653335363437316366
+34326263613533326165333361643065313262323961646563666365313035303366613162646435
+64653938306131626130636664353862666262653330636333306336356361613135393565316230
+65633235663734663237363963396664333632343232373831383665666630396563336135666538
+66303466626230353339353266323564666637393364613864666661323837623332646336313036
+61366334383130613964316263636562313235636534326130353336633339666432336231316537
+38393162323264643432336332393136663839633034383838303336323834313238386230626335
+37356431306135306666393162623939373938653133376636323832613565316333303262623866
+35323862653134333466626463373733623762366134613431323837356465333734326261366162
+62366138303566356266663266663730666665393935363239343463646138623232323533353964
+38646532303232353638303235656533623961386536666632633061333538373131656139656131
+30366632386335373431393739323965373466393638316534383432643331393830636661626133
+32313238353335383966
diff --git a/dan/host_vars/sk-2019vm.yml b/dan/host_vars/sk-2019vm.yml
index 1ac972f5..385754eb 100644
--- a/dan/host_vars/sk-2019vm.yml
+++ b/dan/host_vars/sk-2019vm.yml
@@ -1,21 +1,21 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-37393838356665393130613533313730373837613863336561306563393530326561653434643837
-3837326666393635363762323437643530386565646234620a643964386238626130663331616539
-36653733353565363933333439616236646535613366366237666639663866666665336439386333
-6264313230373633340a353131633632313361356363323965346361376638363038376166313865
-63376363313466663266383534373735303730326266663665666539626563653563363761636139
-63303633623031666437633632393161663166663136353337626432663439313130366337326131
-34306233333734616164393135663764346130383539313161376362386162383862656339653433
-32313539353866653264636365363538343763396336396236656661306237383063613163373433
-35623864623239376662336532333965346433326238646166636334323562346430336265323866
-66363063373037643734653831666431316365356666396331633631376161393739646634616236
-31646662353937623837353562333035646531626665376131363835323135653533646134303232
-65653338333361383461363163353564303732313338383239643731386234636334303062653961
-36393763366338373764313138616533653362653233613639663334623165353036306261333765
-63383735333137613331616665363637333639323231306534666562613461353164373937626262
-31376364623265653036343430343234666463653132623065383065326263396231303533333036
-33326637653165363538383065303764623062326630306539363839663266643138363062356263
-36303935393030383233376536633363623330666230383366643331666262353932386432356432
-32663239323164313838323535373035623430376237643962353465363663363766333161376163
-36666364393931666438663435343737666537396561353130326364626433636534636265353063
-32643733396437373932
+61366466623239303431373835656362643466356538663534376238613431396135396635366633
+3630633232326664313262643730313730643236353830610a366235663839363463316430353535
+36363533333237626536323534663261653165633638383430323465633966663037333564343261
+6539313038623538630a643830613261306666356562373632306333373130333733393338326530
+62643631343931336139393039353732313931353930303066616363306566383737376561343863
+61666161656465306234356339373864643661343137626439623366356232666462353635633731
+36613336663531666137396133373663363032663434663066613761386532306534623730373534
+31643936323164346265643237653338386564313238353630643465386236303862656531636233
+33393639663761643536613438613632656534316535353037633239383233393464326137646635
+61353666313164613531393166353536643962343439633339393264373734333139383161313863
+61343437393366653463643663303635366332353339653933343034316433643263623130653139
+62373133386538373465643739386164373833333663613965633237306266636636323061343538
+38366364343866656464636232656633373536323334336435613665663334386633646135613837
+38663265346163383364633265336138323361313562363436363231336661396133363164343937
+30643566313339336131333762663235336631396133336235373234623737366465323965626132
+33353261313164393862323536343031393332633065613438643961346130643734356332663631
+38393531633536656635343335376134333030313465346136396337343637363534666537313836
+63623434363766363438316439333236363033376236333138653831343236323436663065323732
+61376564393565656165616331303930363063636337386263363362333437386339646666656535
+63306633653162333237
diff --git a/dan/host_vars/sk-tomnext.yml b/dan/host_vars/sk-tomnext.yml
index cc9eda31..6acbe46d 100644
--- a/dan/host_vars/sk-tomnext.yml
+++ b/dan/host_vars/sk-tomnext.yml
@@ -1,21 +1,21 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-64623637363864333635663161656561306662333266613733373033383336326364623534363039
-6231636266303035623261613365613364353532316233390a646463373462363339313239313961
-31363961646463373761346664333937646265333433623132383236643033613666656562303932
-3564313234396433620a633739653966336139333239636363383139383066616662666336616566
-64666365373530633363633238313163333634643339356261373364396263376662386239303037
-34613233323532623130316538623339323833346236393432646238656265666363363635336331
-61626536633837646361313865313735653135313533386534303664393562333461393133616534
-64356432303863663236326232326365323165383761663233396664653964376363626630616663
-61356331626465396430656432613731623032396438303736623663383363643762313431343337
-30363039306264356536346464666262663733393966313132653161376334353763623664396134
-36323135656133393664616535646338323033363666386464336566643836306433633665336332
-38363032363237356336343064666363323638346262623834323530623734343033336632393431
-64646462383364346430326338313730626533346437333135656262333036376133636533353365
-38613133633034653165343437373637353366323438383862383065353363646337643435383334
-35346431353765303866383532386263353930383466323439386466633438643535663935373834
-37653430663331313935633066633862316337666430373164643133316139633133663934303232
-34633836373931373363316334373634363430653436366433393235336566346532663739353033
-31623432323731393966613838366564613661336433386463306538343834656463653831656462
-39383031343038373734313064316638623361343339623130326333303166346263353230323437
-37353666633036386130
+66373639303237636639623639356337313433363436643564643931303636613338383463633566
+3033636638303637373466383931306632623863663531650a396164633937373264393334623230
+62623534386130396330333936353236646562636636386139383635363433343563303766393638
+6331616337666662610a346365343763356636313633626162643637663335616333343939663565
+62386562383437646465323961396334343838356332333461616263306463346236396331393736
+34646565333263333832316432333136386139623764383732353066613630613735613939373236
+37323533623931326331653137323038346335633566306162356563623064626539386536303861
+34303436383861633465643065386134656530343135326532346565616363613436316565373366
+32383031313362643363313264356536373638656161616663616163323363366333353931386238
+62643333666535656434313938333762666662393763636133396162323830363534636566626564
+65616234333831343834373431303765333539363562393631616162373838623838656332666563
+64363662636339613838306366353264313661653435363661396561386634393530616234353632
+32356665343162326531356163373539383139383164343065646464316230303034623565306561
+32316235613030623738383530306461633430656636653333323738643830656435313030343138
+30623564633461626262356433303539663134386365333364613234366639646338663362393334
+34666661333338363838633863346531623634313463383336626364343265626362373934353338
+39333063326232656364386466663136346162343664663865663362663634393666333534356237
+62313030373630306563663334383139646234333365323036393339333635306665336263336139
+66663037396538396631646332623563336661303731396566373934343838633234316437613466
+35356132656365626262
diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml
index 6d1133f6..d018c483 100644
--- a/dan/sk-2019.yml
+++ b/dan/sk-2019.yml
@@ -8,7 +8,7 @@
   - role: core/zsh
   - role: core/cpu-microcode
   - role: core/admin-users
-  - role: cryptdisk
+  - role: storage/luks/volumes
   - role: zfs/base
   - role: apt-repo/spreadspace
   - role: zfs/sanoid
@@ -21,7 +21,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in  cryptdisk_volumes.items() %}
+        {% for name, volume in  luks_volumes.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml
index f082098c..76766433 100644
--- a/dan/sk-2019vm.yml
+++ b/dan/sk-2019vm.yml
@@ -8,7 +8,7 @@
   - role: core/zsh
   - role: core/cpu-microcode
   - role: core/admin-users
-  - role: cryptdisk
+  - role: storage/luks/volumes
   - role: zfs/base
   - role: apt-repo/spreadspace
   - role: zfs/sanoid
@@ -24,7 +24,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in  cryptdisk_volumes.items() %}
+        {% for name, volume in  luks_volumes.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml
index 5b90526b..2e3127e3 100644
--- a/dan/sk-tomnext.yml
+++ b/dan/sk-tomnext.yml
@@ -8,7 +8,7 @@
   - role: core/zsh
   - role: core/cpu-microcode
   - role: core/admin-users
-  - role: cryptdisk
+  - role: storage/luks/volumes
   - role: zfs/base
   - role: apt-repo/spreadspace
   - role: zfs/sanoid
@@ -24,7 +24,7 @@
         #!/bin/bash
         set -e
 
-        {% for name, volume in  cryptdisk_volumes.items() %}
+        {% for name, volume in  luks_volumes.items() %}
         echo -e "opening crypto volume: \033[1;37m{{ name }}\033[0m"
         cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
         {% endfor %}
diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml
index 0004032e..5121cc59 100644
--- a/inventory/host_vars/ch-epimetheus.yml
+++ b/inventory/host_vars/ch-epimetheus.yml
@@ -21,18 +21,18 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 
-cryptdisk_volumes:
+luks_volumes:
   crypto-sata0:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata0'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1674991
   crypto-sata1:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata1'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1357355
   crypto-sata2:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata2'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1522231
   crypto-sata3:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata3'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata3'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T1696205
 
 
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index 6e273d20..12b54004 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -50,21 +50,21 @@ installer_lvm:
   fs: ext4
 
 
-cryptdisk_volumes:
+luks_volumes:
   crypto-nvme0:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}"
     device: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310329Z-part4
   crypto-nvme1:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}"
     device: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310327Y-part4
   crypto-sata0:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata0'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6HGTN
   crypto-sata1:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata1'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6GT2N
   crypto-sata2:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-sata2'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}"
     device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6A2UN
 
 
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index 90e627a5..2d1cc8f1 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -31,12 +31,12 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 
-cryptdisk_volumes:
+luks_volumes:
   crypto-nvme0:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}"
     device: /dev/disk/by-id/nvme-eui.0025388791050fef-part3
   crypto-nvme1:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}"
     device: /dev/disk/by-id/nvme-eui.0025388791050fdc-part3
 
 
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 45348c4a..d5041593 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -31,12 +31,12 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 
-cryptdisk_volumes:
+luks_volumes:
   crypto-nvme0:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}"
     device: /dev/disk/by-id/nvme-eui.0025388291b201dc-part3
   crypto-nvme1:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}"
     device: /dev/disk/by-id/nvme-eui.0025388291b201cb-part3
 
 
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index 3a71899a..573fe06e 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -31,12 +31,12 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 
-cryptdisk_volumes:
+luks_volumes:
   crypto-nvme0:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme0'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}"
     device: /dev/disk/by-id/nvme-eui.00000000000000018ce38e0500157a42-part3
   crypto-nvme1:
-    passphrase: "{{ vault_cryptdisk_volumes['crypto-nvme1'].passphrase }}"
+    passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}"
     device: /dev/disk/by-id/nvme-eui.00000000000000018ce38e0500157b3d-part3
 
 
diff --git a/roles/cryptdisk/defaults/main.yml b/roles/storage/luks/volumes/defaults/main.yml
index 9dca3e80..2347231c 100644
--- a/roles/cryptdisk/defaults/main.yml
+++ b/roles/storage/luks/volumes/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-# cryptdisk_volumes:
+# luks_volumes:
 #   crypto-nvme0:
 #     passphrase: "keep-this-very-very-secret"
 #     device: /dev/nvme0n1p3
diff --git a/roles/cryptdisk/tasks/main.yml b/roles/storage/luks/volumes/tasks/main.yml
index c0422bb3..8fdb3019 100644
--- a/roles/cryptdisk/tasks/main.yml
+++ b/roles/storage/luks/volumes/tasks/main.yml
@@ -1,8 +1,7 @@
 ---
 - name: install cryptsetup packages
   apt:
-    name:
-    - cryptsetup-bin
+    name: cryptsetup-bin
     state: present
 
 - name: Create temporary build directory
@@ -12,11 +11,10 @@
   changed_when: False
   check_mode: False
 
-- name: create cryptdisk volumes
+- name: create luks volumes
   block:
-
   - name: write passphrases into temporary keyfiles
-    loop: "{{ cryptdisk_volumes | dict2items }}"
+    loop: "{{ luks_volumes | dict2items }}"
     loop_control:
       label: "{{ item.key }}"
     copy:
@@ -27,7 +25,7 @@
     check_mode: False
 
   - name: create/open luks volumes
-    loop: "{{ cryptdisk_volumes | dict2items }}"
+    loop: "{{ luks_volumes | dict2items }}"
     loop_control:
       label: "{{ item.key }} ({{ item.value.device }})"
     luks_device: