Merge pull request #439 from pneerincx/fix/cleanup

Fix/cleanup
rug-cit-hpc · Aug 2, 2021 · 4e81df0 · 4e81df0
2 parents 293b79d + e2b4114
commit 4e81df0
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -219,10 +219,10 @@ Are you sure you want to continue connecting (yes/no)?
 
 Execute:
 ```bash
-dd if=/dev/urandom bs=1 count=1024 > roles/slurm_management/files/[name-of-the-cluster]_munge.key
-ansible-vault encrypt --encrypt-vault-id [name-of-the-cluster] roles/slurm_management/files/[name-of-the-cluster]_munge.key
+dd if=/dev/urandom bs=1 count=1024 > files/[name-of-the-cluster]_cluster/munge.key
+ansible-vault encrypt --encrypt-vault-id [name-of-the-cluster] files/[name-of-the-cluster]_cluster/munge.key
 ```
-The encrypted ```[name-of-the-cluster]_munge.key``` can now safely be committed.
+The encrypted ```files/[name-of-the-cluster]_cluster/munge.key``` can now safely be committed.
 
 #### 7. Running playbooks.
 

diff --git a/...s/slurm_management/files/fender_munge.key → files/fender_cluster/munge.key b/...s/slurm_management/files/fender_munge.key → files/fender_cluster/munge.key
diff --git a/...lurm_management/files/gearshift_munge.key → files/gearshift_cluster/munge.key b/...lurm_management/files/gearshift_munge.key → files/gearshift_cluster/munge.key
diff --git a/...m_management/files/hyperchicken_munge.key → files/hyperchicken_cluster/munge.key b/...m_management/files/hyperchicken_munge.key → files/hyperchicken_cluster/munge.key
diff --git a/...s/slurm_management/files/marvin_munge.key → files/marvin_cluster/munge.key b/...s/slurm_management/files/marvin_munge.key → files/marvin_cluster/munge.key
diff --git a/.../slurm_management/files/nibbler_munge.key → files/nibbler_cluster/munge.key b/.../slurm_management/files/nibbler_munge.key → files/nibbler_cluster/munge.key
diff --git a/roles/slurm_management/files/talos_munge.key → files/talos_cluster/munge.key b/roles/slurm_management/files/talos_munge.key → files/talos_cluster/munge.key
diff --git a/group_vars/nibbler_cluster/secrets.yml b/group_vars/nibbler_cluster/secrets.yml
@@ -1,60 +1,60 @@
 $ANSIBLE_VAULT;1.2;AES256;nibbler
-36303435323331663136373065323739636666383264323666643339303763633163383739313562
-6666633939343637343264386637353232306462346432660a356431373538313837376537653730
-62376638323132613064316337323134356438313266353361353166383330373333643361366465
-3839663862353437660a653938373335373435376230323964643239393739633938623362376235
-37393864353833336566363161363930336164653363316333343965366633613962613634353034
-38613938336639393366306162356461633534316335646261353761346463376465353434623561
-64313064623338666334376233626463313165613237343339326664346436386139306364366239
-63613162633232396363333635643938303838363562313334366334306134373365653234313830
-39636139616331313966383431306666376633643737373362316431323466346136633034616134
-35333232633830643431636337643634313937346530643433373961313265613961663762613363
-63323830663230363861356233646331613964656430336161396535613763633962633662323063
-38356264646465323730633336313536393634383536333966323136623333316265633339356632
-37393563353963353434356562643535663636356563633535373936613865393736343334636162
-37633666306531373662643038636537346463353339303531646232613238646233616530366638
-63333463316562646166313339626430396665383062336664643161643765386131376637653336
-61656331366335653934356266383563613465316632353639653365636233643761623131303166
-36333965313030396266396562643165393638396364643437326330646632326334643332333334
-38633166616463623236336231383563356433313033393364306634343863366163363531666237
-34623034643234303765323235376463356630326262376161326431323638666538356566313738
-62646539376438323563313461663435363365623361323462313861323462366632626432633233
-36356538363366336431346661653530396338386337326361316565666365376331343235323334
-38656539323637366134383437376635383333653730656130333733373434313164623265653936
-61303039356534396264316336393133623333336137653833666639306434306564633539376632
-35333964383330316239633233366537326434333434366366336134663763636362303733356233
-33386534363536393933666233383339646439643262633061613063313033653437666233643531
-31356566656665623131653434646265616234326461313166323066323235343835313164323165
-35323036306631313930623161386635623335346236353164396636376562316466613635643533
-35613363313634393263646163376238656232373433383164656334643434356234393437386262
-37316463616433393139623363343939316138303332613130333334623137643964323330333337
-32386134323964343066613633633564303962646234313632633838333039363830303630373163
-34363039343132326364333935393938363163623164336131623762343333656132666132303739
-66303238636231353431366336383666323130626466643138653764633262323731653736626564
-66366236636662363264326535383966343434663665306362336331346162363662663963616464
-31336431346563343735636463366236633737386433346266643962303335333137313332303531
-32363830623861633037383535613031626136623539303765383232316161626361646332396563
-36313864373231663662383865616334653564366236666536343666383039346236633761336535
-65323933363337383431643566336635656335373634616139303638636137373564366338383833
-38393236363034353732333137303832363264363135316262323436633634656162646361616635
-34626532333837636631313533656362623939633262313763666162353635643361656332393136
-39363863626233663564353035383334323330303733653532316539616336366263353461326135
-31623762653539653664386431626531623237653036623263356136656132663161663466633834
-37393131316661316136616161306163333730323231313064353462643866613330393034663439
-35636138316665393231383338303035333161666338343838353332396230366236373138613338
-35623539313164393961323362643363393331353563646433396234373764353666646637616330
-64303530363261373237623631343662626365396461623638656361353136663962306465393939
-30373135363862653035633831393461653837353237376564653537313434313962343861633738
-35653435393636376137343630653963353262366239326435353836346261303766326536333764
-61323632376262306666333035353662343533303136333161386434643462353464336338346366
-62356366646664306261663532333736306539326235366138623437383633343631313230613632
-36653235646662336664326332363262373438653463356661626464336264613835643963393165
-33626637353335653263316665383363313033373763323763313638646461303162653830613632
-61663132363436333937343463643635613836613839343433616561643431363966633338373534
-63386134663939656634306166623639343663643161626164306337303430633739373331363930
-38396530383962313763366234653863393232653838623535363163613932373237393866303838
-38316637666431306562353261636262623936316531663430653266663433653162666530646461
-61616262303862656461616165653163356535303739386363393765353561613031396339343666
-64323335353337633534376532616631306338363561383362636636303965386339313433306266
-63333132303566623431653065363063316337623235663833373862383861643336393162633632
-663435636163653932396539303234623436
+31396336343062363562376564313732303561666163386638666664313534646364333138653833
+3331383366326138623831613761336436643733643938350a356233346261666235353530623637
+31623361353236306435396433363433316162653865663162313366613935353038313336323136
+3738626333636435630a333130363964323265663063323061616162303730653463353932376464
+39396531353633333365633134343465343934396361656131666438336536653162363262663236
+66353834643561306434633934396535353639393833356636323765346332623632656266343664
+30303262616661656132373335613937303037306239373539363465373563633564663431393732
+37643937636237363631623032653964386136333232653239303565663065333465326137633139
+61383362313939636562316539633364363037333264326361353763653832316564346138636465
+31313038373364316338613730636430353132303535363133643363623733646634646137356431
+36316538376461663139663432323565306139353262386130333866393736356566333634613438
+62383132386337653630616237656639346666383838386538316332353066663861323162313531
+63363961353063303238383733373934646533323462356363613163656561323133626361316237
+63613330636338313061383562303436353534383234343966383832316164386136643563326266
+65653931316364373934653632396635323762643236666239653335616331343331623433646336
+62386531366163353438383763363136343434386165383364653634363336353631366239633237
+62633033326534333562646139376263646434303665386162333538376361366264653737623138
+34333234316134303435646131626130316439633836643133626536303332393038343965306361
+37353664323439333636383062363836383364623237323563386131626263613266646432306230
+63323634643432343134643339303339653536333266373063346262346266383137366266343231
+33343163333061336234666566343233373733356330646466333232316363323134336631346264
+64633236626634383934616437376335663430616131343165386665313335663037353962393830
+33626639316631663839663932326333303736373836346161356136363434656464383666663062
+31343534383733396538336461643761356564616262323464633932616439653933333265323836
+38613836633130653761333463343765366661353666343735396631646134383132393836343535
+34616131396133346338623638363532366262643131363665316237633863376333353532663836
+36323830363338323837376565636563313965316630396134396439373832343837323363383663
+63613834613834616561613230613838313061666365343764393038346336646538356136653962
+36386638643733663133376332346534633134393634653635363964306632656263643033393230
+61323936306363383533636362616237626539613232643432663331313364363066613937393965
+62303433303362396537346432306538653834633634393365373935613639616632303336396462
+62626164373736323032323431313534666662323665653038613939666165663566643661633463
+63663730383664366663333461623666356132643764306364363136663438396365323434306631
+62396161303130393334636164313837656363373330376466646463386265653565383434386162
+32333538313766316331373038653561363731653839353366376630343761383465366662303935
+61393365376535663661326361303238386464646362353836373730326331323265326662626435
+32303330346338623531633338383766323037386533353536613836623935643563656432343639
+36626539396634386662336430643132346538306334666665303039626466373337636533633930
+61303863666435626462383736343463666638323864306238303336653732306566373862393333
+36663536316238313164643632356634653638643439396232313663343464336564386433336130
+37343733343933303532323137366539376635343564303430336661663636663231323266643734
+39373962333633666130376439313764343031623436396230653934346237383931343763306463
+62636333316632616232353534633539346366316137333161316464343264383765396336373638
+64613466636664383230383836313664346632303933373232353165306532623966303231363734
+64393164663861316538303738653333343661303164366666636139656230303938303336626262
+39373261653063623535653436643966346463326165663430323633393665373937376464346635
+37353430343366616636613162633231313961313666613539376431336637303666633531666361
+32383666633430356536386530383836653833636631643830356131623332616261613338326534
+37653266376534303765396532656235313634613633313638386439336337393362313336313531
+32653665343965303662643062376262393736616536393563316464326161353731613136386263
+39643138316365643439643230656563636265663937373864643332373833653832653061613231
+36313733396238343739646662343463323664313734393930323062326263303166633932393732
+33623539353833353234306565393230616334656138666164306664613964613266313633353530
+36333832306264353534396564343533396331633030653066373231323834316232666166333334
+66393130393935323161656230346636356666616563366234353234373932383135626330343130
+65653831306539643561356362386665663663633131343938326136336631656666383338326163
+64623162616131633662393263353861323861623039396237376566653035333138343564323062
+36333538303730653265656636373639393637363432393162346133343564616137623031303864
+366233613734633461313033326336303861
diff --git a/roles/cluster/templates/lustre.conf b/roles/cluster/templates/lustre.conf
diff --git a/roles/slurm_client/tasks/main.yml b/roles/slurm_client/tasks/main.yml
@@ -86,7 +86,7 @@
 
 - name: 'Install munge_keyfile.'
   copy:
-    src: "roles/slurm_management/files/{{ slurm_cluster_name }}_munge.key"
+    src: "{{ slurm_cluster_name }}_cluster/munge.key"
     owner: 'munge'
     group: 'munge'
     mode: '0600'

diff --git a/roles/slurm_management/tasks/main.yml b/roles/slurm_management/tasks/main.yml
@@ -59,7 +59,7 @@
 
 - name: 'Install munge.key file.'
   copy:
-    src: "files/{{ slurm_cluster_name }}_munge.key"
+    src: "{{ slurm_cluster_name }}_cluster/munge.key"
     owner: 'munge'
     group: 'munge'
     mode: '0600'