diff options
Diffstat (limited to 'dan')
-rw-r--r-- | dan/ele-dione.yml | 2 | ||||
-rw-r--r-- | dan/ele-emc-ctrl.yml | 2 | ||||
-rw-r--r-- | dan/ele-media.yml | 2 | ||||
-rw-r--r-- | dan/ele-thetys.yml | 2 | ||||
-rw-r--r-- | dan/emc-cdn.yml | 2 | ||||
-rw-r--r-- | dan/host_vars/sk-2019.yml | 40 | ||||
-rw-r--r-- | dan/host_vars/sk-2019vm.yml | 40 | ||||
-rw-r--r-- | dan/host_vars/sk-tomnext.yml | 40 | ||||
-rw-r--r-- | dan/sk-2019.yml | 10 | ||||
-rw-r--r-- | dan/sk-2019vm.yml | 6 | ||||
-rw-r--r-- | dan/sk-cloudio.yml | 2 | ||||
-rw-r--r-- | dan/sk-tomnext-nc.yml | 2 | ||||
-rw-r--r-- | dan/sk-tomnext.yml | 6 |
13 files changed, 78 insertions, 78 deletions
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 %} |