diff options
44 files changed, 177 insertions, 178 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 diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml index 376fb421..52c9528d 100644 --- a/dan/ele-dione.yml +++ b/dan/ele-dione.yml @@ -13,7 +13,7 @@ hosts: ele-dione roles: - role: core/admin-users - - role: storage/zfs/pools + - role: storage/zfs/base - role: apt-repo/spreadspace - role: nginx/base - role: monitoring/prometheus/exporter diff --git a/dan/ele-emc-ctrl.yml b/dan/ele-emc-ctrl.yml index 9cdd3ca7..b24d8df4 100644 --- a/dan/ele-emc-ctrl.yml +++ b/dan/ele-emc-ctrl.yml @@ -14,5 +14,5 @@ - role: apt-repo/spreadspace - role: nginx/base - role: monitoring/prometheus/exporter - - role: storage/lvm/groups + - role: storage/lvm/base - role: elevate/emc-stats diff --git a/dan/ele-media.yml b/dan/ele-media.yml index cf90b2f6..5406c56a 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -13,7 +13,7 @@ hosts: ele-media roles: - role: core/admin-users - - role: storage/zfs/pools + - role: storage/zfs/base - role: apt-repo/spreadspace - role: kubernetes/base - role: kubernetes/standalone/base diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index f37be858..e0775d23 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -12,7 +12,7 @@ - name: Payload Setup hosts: ele-thetys roles: - - role: storage/lvm/groups + - role: storage/lvm/base - role: core/admin-users - role: apt-repo/spreadspace - role: nginx/base diff --git a/dan/emc-cdn.yml b/dan/emc-cdn.yml index 2afa25ea..94697fdf 100644 --- a/dan/emc-cdn.yml +++ b/dan/emc-cdn.yml @@ -11,7 +11,7 @@ - name: Payload Setup hosts: "{{ install_hostname }}" roles: - - role: storage/lvm/groups + - role: storage/lvm/base - role: apt-repo/spreadspace - role: nginx/base - role: monitoring/prometheus/exporter diff --git a/dan/host_vars/sk-2019.yml b/dan/host_vars/sk-2019.yml index 6a508147..2882acd5 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 -31316530636334316661633331663365663637623361356663626564386563333937343064373762 -3231623665663231303431343233386537623637383663320a383935353539303334653766663566 -30343966343033643530626238343232623937643933646336346130363964393036323233613565 -3665616539373131380a346431383933373162343234633136393936643962303462373364386135 -64626135626361633535613539336561616430653035653234646634666162646133383631346666 -38326639623436653265643962363439343163643938653263393563326530373561643665356333 -38363535663338613437626436613662333039616239306663623936346366646337306663353463 -31373931353830333539366565383765333232643836646461326633343363653335363437316366 -34326263613533326165333361643065313262323961646563666365313035303366613162646435 -64653938306131626130636664353862666262653330636333306336356361613135393565316230 -65633235663734663237363963396664333632343232373831383665666630396563336135666538 -66303466626230353339353266323564666637393364613864666661323837623332646336313036 -61366334383130613964316263636562313235636534326130353336633339666432336231316537 -38393162323264643432336332393136663839633034383838303336323834313238386230626335 -37356431306135306666393162623939373938653133376636323832613565316333303262623866 -35323862653134333466626463373733623762366134613431323837356465333734326261366162 -62366138303566356266663266663730666665393935363239343463646138623232323533353964 -38646532303232353638303235656533623961386536666632633061333538373131656139656131 -30366632386335373431393739323965373466393638316534383432643331393830636661626133 -32313238353335383966 +65356433653063643165336636353364333339626236303637353639346166623666333136663466 +3637633166353765393636323931336338616435383736620a393565653533643732323661336433 +36636164633535303531343362383439633038323539346331666333333964616164636362363666 +6230313331636566630a636539306135343532643234323566656635353836383865373865643337 +32313739663638336232313462663261383632313866663131626330353766613338346231363131 +65616564353865633930623732323262393232343161633764633430316437303138323635333335 +31383361313861646537636133346137393362663566653936626137663839353430373265353262 +33653432366234366531376163613762383961323333303864656335313265363163613666396534 +65366136353765323165636438663336653137363136636565313934643262303939353563663635 +32643336623564386464353065346134303063346533353833363334626535663137333164383961 +39343161316433386233373866366138666664316332613039633531653564343137313961636436 +30613131323635633833613762346538373533316566616639326461626366343663366238333661 +31636462626539663965613063633832656235343562616533383531353133383137333032643564 +39613234353061323131643530613430303233336331653136363836636639383761633635393636 +39393539393066323238636334316537333239353837343934633364323937306634336233363863 +61383661316438386338653735626162613732613634333464393739633061666566623531626166 +30636262343633313730346462373738396535383164666266396265366635653866306464663234 +32646232666135313264656538633834363931643232626431383539613462626364363763616437 +31633761326535613363653861316534363236336332313961343532623434363737326434356439 +66626335616634613364 diff --git a/dan/host_vars/sk-2019vm.yml b/dan/host_vars/sk-2019vm.yml index 385754eb..3f728447 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 -61366466623239303431373835656362643466356538663534376238613431396135396635366633 -3630633232326664313262643730313730643236353830610a366235663839363463316430353535 -36363533333237626536323534663261653165633638383430323465633966663037333564343261 -6539313038623538630a643830613261306666356562373632306333373130333733393338326530 -62643631343931336139393039353732313931353930303066616363306566383737376561343863 -61666161656465306234356339373864643661343137626439623366356232666462353635633731 -36613336663531666137396133373663363032663434663066613761386532306534623730373534 -31643936323164346265643237653338386564313238353630643465386236303862656531636233 -33393639663761643536613438613632656534316535353037633239383233393464326137646635 -61353666313164613531393166353536643962343439633339393264373734333139383161313863 -61343437393366653463643663303635366332353339653933343034316433643263623130653139 -62373133386538373465643739386164373833333663613965633237306266636636323061343538 -38366364343866656464636232656633373536323334336435613665663334386633646135613837 -38663265346163383364633265336138323361313562363436363231336661396133363164343937 -30643566313339336131333762663235336631396133336235373234623737366465323965626132 -33353261313164393862323536343031393332633065613438643961346130643734356332663631 -38393531633536656635343335376134333030313465346136396337343637363534666537313836 -63623434363766363438316439333236363033376236333138653831343236323436663065323732 -61376564393565656165616331303930363063636337386263363362333437386339646666656535 -63306633653162333237 +31323764346661386139383032303266363633313764666462623534643433396631333062366631 +3435663166366366663734383739323731356161623835300a666335373262383065636665646136 +30653035393231643134623464383531623430633663666461306437383831326635363163623765 +3465323635376166620a343933626435323765373837313063363036326236653330353434303566 +66333664616362303533663764383939633366656166303936646263613934663139626365633137 +36633536333336643433643962616635646330383237326165343239633338313465636236373832 +65366331636464613434646266623166653932363239346339613934333732383765616566396232 +61333066353632346138663464393033316563336239326237613630303738396166373835643931 +36366436346461343735623338343938623234643039643239383463333966376363653035333966 +63363561376134656636333538313034356565616465333566633732643138316234326666343762 +61303230396163356538316661313763656563663063636238633239393661346264353563313165 +64376435323161316436333335343336363333303361613535646238353236353333366338386633 +65613036303162653136613935373266393631656431643830303637316438653233376130326461 +36616434343765386261326233376663396364346233343734363062653039396162396533626533 +30323438313865366136393233393438316430653931383630316333623430393733333535643735 +65643838633532353433343262356237333432343531336366323832356665306133656139373564 +37383531333030643432333137396332373036626134396332623530666636396162323237396636 +66656461373038316334313165633636663137323661353733343536656262323033623466346466 +62383835323066653063636566623765306362616166666130356361623964656330656236396165 +31663930633232653838 diff --git a/dan/host_vars/sk-tomnext.yml b/dan/host_vars/sk-tomnext.yml index 6acbe46d..fc3ea2c6 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 -66373639303237636639623639356337313433363436643564643931303636613338383463633566 -3033636638303637373466383931306632623863663531650a396164633937373264393334623230 -62623534386130396330333936353236646562636636386139383635363433343563303766393638 -6331616337666662610a346365343763356636313633626162643637663335616333343939663565 -62386562383437646465323961396334343838356332333461616263306463346236396331393736 -34646565333263333832316432333136386139623764383732353066613630613735613939373236 -37323533623931326331653137323038346335633566306162356563623064626539386536303861 -34303436383861633465643065386134656530343135326532346565616363613436316565373366 -32383031313362643363313264356536373638656161616663616163323363366333353931386238 -62643333666535656434313938333762666662393763636133396162323830363534636566626564 -65616234333831343834373431303765333539363562393631616162373838623838656332666563 -64363662636339613838306366353264313661653435363661396561386634393530616234353632 -32356665343162326531356163373539383139383164343065646464316230303034623565306561 -32316235613030623738383530306461633430656636653333323738643830656435313030343138 -30623564633461626262356433303539663134386365333364613234366639646338663362393334 -34666661333338363838633863346531623634313463383336626364343265626362373934353338 -39333063326232656364386466663136346162343664663865663362663634393666333534356237 -62313030373630306563663334383139646234333365323036393339333635306665336263336139 -66663037396538396631646332623563336661303731396566373934343838633234316437613466 -35356132656365626262 +32633430643636636263663937653962346365323663323335326366363134386163373532643666 +3462383534633339623538646230653639393534343536360a343665316266613464333066626631 +36393863383832303761386566343430343138343230643761623761396239633839666266356265 +6164333761343338620a623432663562626332656136626537396230303766616631373733383566 +34356561613066356666646631373466316162383063386262646435343935356135623261393439 +38656639643366346338326136306239323637336237363532353334623639363539333131653935 +33306239313131326531613466613330346430376639666564383263643031666636326263346462 +63626135393338386166666539386337633361393334666238393833373437313739636465393161 +34633266633862303937346366363634613165313635646164663131393634376330386464316666 +31396433383761316431343036383134303732653765613330303863333934333839643764346331 +61623038303638313632343038306464653030663933313462656438303564363433356438303637 +65666363633166306630333866323034396131313866653338346465653637653564323363376531 +35636263623039356437333563636131373237623034393362653736356265363261306132373738 +39656437353561323633323565646464333361303530333530646234663036653937663231616237 +65313061613638393131666430306464366564383963346334646365366234663737633363303963 +35336663343936663661326638333136616432383831306333643363663761363937626466393331 +31343538353735626464643162306164623963613937656136393934663761633435376636303861 +33646432643963313131353639396432653337626232653262346133313564373766396537356362 +33373466393462376137323264616662343962376463303030616335303431386131613565356365 +38653564303532373566 diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml index 192a5a3b..525c2353 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.yml @@ -8,8 +8,8 @@ # - role: core/zsh - role: core/cpu-microcode # - role: core/admin-users - - role: storage/luks/volumes - - role: storage/zfs/pools + - role: storage/luks/base + - role: storage/zfs/base - role: apt-repo/spreadspace - role: storage/zfs/sanoid tasks: @@ -21,7 +21,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 %} @@ -76,7 +76,7 @@ mode: 0500 - name: generate key files for crypto volumes - loop: "{{ luks_volumes | dict2items }}" + loop: "{{ luks_devices | dict2items }}" loop_control: label: "{{ item.key }}" copy: @@ -90,7 +90,7 @@ dest: /etc/crypttab content: | # ansible generated - {% for name, volume in luks_volumes.items() %} + {% for name, volume in luks_devices.items() %} {{ name }} {{ volume.device }} /etc/cryptsetup-keys.d/{{ name }}.key luks {% endfor %} notify: rebuild initramfs diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml index 6e2a7331..3f1baedd 100644 --- a/dan/sk-2019vm.yml +++ b/dan/sk-2019vm.yml @@ -8,8 +8,8 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: storage/luks/volumes - - role: storage/zfs/pools + - role: storage/luks/base + - role: storage/zfs/base - role: storage/zfs/sanoid - role: vm/host/base - role: vm/host/network @@ -23,7 +23,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 %} diff --git a/dan/sk-cloudio.yml b/dan/sk-cloudio.yml index 8251a675..ba809fdf 100644 --- a/dan/sk-cloudio.yml +++ b/dan/sk-cloudio.yml @@ -12,7 +12,7 @@ hosts: sk-cloudio roles: - role: core/admin-users - - role: storage/zfs/pools + - role: storage/zfs/base - role: apt-repo/spreadspace - role: storage/zfs/sanoid - role: kubernetes/base diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index 1cb392d4..8af7979f 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.yml @@ -7,7 +7,7 @@ - role: core/sshd/base - role: core/zsh - role: core/admin-users - - role: storage/zfs/pools + - role: storage/zfs/base - role: apt-repo/spreadspace - role: storage/zfs/sanoid - role: kubernetes/base diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml index a30ef1fa..c643499f 100644 --- a/dan/sk-tomnext.yml +++ b/dan/sk-tomnext.yml @@ -8,8 +8,8 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: storage/luks/volumes - - role: storage/zfs/pools + - role: storage/luks/base + - role: storage/zfs/base - role: storage/zfs/sanoid - role: vm/host/base - role: vm/host/network @@ -23,7 +23,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 %} diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml index a2126abd..5188940b 100644 --- a/inventory/host_vars/ch-epimetheus.yml +++ b/inventory/host_vars/ch-epimetheus.yml @@ -53,18 +53,18 @@ prometheus_job_multitarget_ssl__probe: module: file -luks_volumes: +luks_devices: crypto-sata0: - passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata0'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZGY976JP crypto-sata1: - passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata1'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZDHAVYJT crypto-sata2: - passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata2'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZGY9802C crypto-sata3: - passphrase: "{{ vault_luks_volumes['crypto-sata3'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata3'].passphrase }}" device: /dev/disk/by-id/ata-ST4000VN008-2DR166_ZDHADPQL @@ -101,7 +101,7 @@ zfs_sanoid_modules: zfs_syncoid_autosuspend: disks -zfs_syncoid_autosuspend_disks: "{{ luks_volumes | dict2items | map(attribute='value.device') }}" +zfs_syncoid_autosuspend_disks: "{{ luks_devices | dict2items | map(attribute='value.device') }}" zfs_syncoid_target_pool: backup zfs_syncoid_sources: 'ch-prometheus': diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml index 88a4784f..3bdeac5d 100644 --- a/inventory/host_vars/ch-prometheus.yml +++ b/inventory/host_vars/ch-prometheus.yml @@ -84,21 +84,21 @@ installer_storage: fs: ext4 -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNX0T354642E-part4 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-Samsung_SSD_980_PRO_1TB_S5GXNF1R804538A-part4 crypto-sata0: - passphrase: "{{ vault_luks_volumes['crypto-sata0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata0'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6HGTN crypto-sata1: - passphrase: "{{ vault_luks_volumes['crypto-sata1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata1'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD121KRYZ-01W0RB0_5QHUESHB crypto-sata2: - passphrase: "{{ vault_luks_volumes['crypto-sata2'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-sata2'].passphrase }}" device: /dev/disk/by-id/ata-WDC_WD102KRYZ-01A5AB0_VCG6A2UN diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 6b071894..a2f6ef90 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -134,7 +134,7 @@ elevate_media_nextcloud_storage: elevate_media_nextcloud_instance_name: media.elev8.at elevate_media_nextcloud_instance: - version: 27.1.2 + version: 28.0.1 port: 8100 hostnames: - media.elev8.at diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml index d964f124..ed9b490a 100644 --- a/inventory/host_vars/sk-2019.yml +++ b/inventory/host_vars/sk-2019.yml @@ -30,12 +30,12 @@ apt_repo_components: - non-free ## for microcode updates -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-eui.0025388791050fef-part3 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-eui.002538bc21a02d15-part3 diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index 54205118..06a4b252 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -37,12 +37,12 @@ apt_repo_components: - non-free-firmware -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-eui.0025388291b201dc-part3 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['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 036aea44..54ea19f3 100644 --- a/inventory/host_vars/sk-tomnext.yml +++ b/inventory/host_vars/sk-tomnext.yml @@ -32,12 +32,12 @@ apt_repo_components: - non-free-firmware -luks_volumes: +luks_devices: crypto-nvme0: - passphrase: "{{ vault_luks_volumes['crypto-nvme0'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme0'].passphrase }}" device: /dev/disk/by-id/nvme-eui.00000000000000018ce38e0500157a42-part3 crypto-nvme1: - passphrase: "{{ vault_luks_volumes['crypto-nvme1'].passphrase }}" + passphrase: "{{ vault_luks_devices['crypto-nvme1'].passphrase }}" device: /dev/disk/by-id/nvme-eui.00000000000000018ce38e0500157b3d-part3 diff --git a/roles/storage/luks/volumes/defaults/main.yml b/roles/storage/luks/base/defaults/main.yml index 2347231c..c2aa39c6 100644 --- a/roles/storage/luks/volumes/defaults/main.yml +++ b/roles/storage/luks/base/defaults/main.yml @@ -1,5 +1,5 @@ --- -# luks_volumes: +# luks_devices: # crypto-nvme0: # passphrase: "keep-this-very-very-secret" # device: /dev/nvme0n1p3 diff --git a/roles/storage/luks/volumes/tasks/main.yml b/roles/storage/luks/base/tasks/main.yml index 8fdb3019..7fe556a1 100644 --- a/roles/storage/luks/volumes/tasks/main.yml +++ b/roles/storage/luks/base/tasks/main.yml @@ -14,7 +14,7 @@ - name: create luks volumes block: - name: write passphrases into temporary keyfiles - loop: "{{ luks_volumes | dict2items }}" + loop: "{{ luks_devices | dict2items }}" loop_control: label: "{{ item.key }}" copy: @@ -25,7 +25,7 @@ check_mode: False - name: create/open luks volumes - loop: "{{ luks_volumes | dict2items }}" + loop: "{{ luks_devices | dict2items }}" loop_control: label: "{{ item.key }} ({{ item.value.device }})" luks_device: diff --git a/roles/storage/lvm/groups/defaults/main.yml b/roles/storage/lvm/base/defaults/main.yml index 224d35b5..224d35b5 100644 --- a/roles/storage/lvm/groups/defaults/main.yml +++ b/roles/storage/lvm/base/defaults/main.yml diff --git a/roles/storage/lvm/groups/tasks/main.yml b/roles/storage/lvm/base/tasks/main.yml index ddcd49c7..ddcd49c7 100644 --- a/roles/storage/lvm/groups/tasks/main.yml +++ b/roles/storage/lvm/base/tasks/main.yml diff --git a/roles/storage/zfs/pools/defaults/main.yml b/roles/storage/zfs/base/defaults/main.yml index 1566890d..1566890d 100644 --- a/roles/storage/zfs/pools/defaults/main.yml +++ b/roles/storage/zfs/base/defaults/main.yml diff --git a/roles/storage/zfs/pools/tasks/Debian.yml b/roles/storage/zfs/base/tasks/Debian.yml index a1ed0387..a1ed0387 100644 --- a/roles/storage/zfs/pools/tasks/Debian.yml +++ b/roles/storage/zfs/base/tasks/Debian.yml diff --git a/roles/storage/zfs/pools/tasks/Ubuntu.yml b/roles/storage/zfs/base/tasks/Ubuntu.yml index 9745d716..9745d716 100644 --- a/roles/storage/zfs/pools/tasks/Ubuntu.yml +++ b/roles/storage/zfs/base/tasks/Ubuntu.yml diff --git a/roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml b/roles/storage/zfs/base/tasks/enable-systemd-mount-generator.yml index 1d50c873..1d50c873 100644 --- a/roles/storage/zfs/pools/tasks/enable-systemd-mount-generator.yml +++ b/roles/storage/zfs/base/tasks/enable-systemd-mount-generator.yml diff --git a/roles/storage/zfs/pools/tasks/main.yml b/roles/storage/zfs/base/tasks/main.yml index 99b8e228..99b8e228 100644 --- a/roles/storage/zfs/pools/tasks/main.yml +++ b/roles/storage/zfs/base/tasks/main.yml diff --git a/roles/storage/zfs/volume/tasks/main.yml b/roles/storage/zfs/volume/tasks/main.yml index 0dc0e82d..260d706d 100644 --- a/roles/storage/zfs/volume/tasks/main.yml +++ b/roles/storage/zfs/volume/tasks/main.yml @@ -1,5 +1,4 @@ --- - ## TODO: implement recursive nesting - name: check volume parent when: "'parent' in zfs_volume" assert: diff --git a/spreadspace/glt-calypso.yml b/spreadspace/glt-calypso.yml index 62f27950..07dd2eb2 100644 --- a/spreadspace/glt-calypso.yml +++ b/spreadspace/glt-calypso.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/ntp - role: core/cpu-microcode - - role: storage/zfs/pools + - role: storage/zfs/base - role: apt-repo/spreadspace - role: streaming/blackmagic/desktopvideo - role: kubernetes/base diff --git a/spreadspace/glt-tsdatacop.yml b/spreadspace/glt-tsdatacop.yml index 2e0758b4..82c363ab 100644 --- a/spreadspace/glt-tsdatacop.yml +++ b/spreadspace/glt-tsdatacop.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/ntp - role: core/cpu-microcode - - role: storage/lvm/groups + - role: storage/lvm/base - role: apt-repo/spreadspace - role: streaming/blackmagic/desktopvideo - role: kubernetes/base diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index f7b4fc1f..e4c83d21 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -10,7 +10,7 @@ - role: apt-repo/spreadspace - role: network/wireguard/base - role: network/wireguard/p2p - - role: storage/zfs/pools + - role: storage/zfs/base - role: streaming/blackmagic/desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base |