Relaunch JS@IU, now with more elastic

galaxyproject · Jun 11, 2018 · 14f78d9 · 14f78d9
1 parent f495dd5
commit 14f78d9
Show file tree

Hide file tree

Showing 29 changed files with 496 additions and 296 deletions.
diff --git a/env/galaxy/group_vars/cvmfsservers/vars.yml b/env/galaxy/group_vars/cvmfsservers/vars.yml
@@ -1,3 +1,5 @@
 ---
 
 cvmfsservers_group_authorized_key_users: "{{ vault_cvmfsservers_group_authorized_key_users }}"
+
+galaxy_cvmfs_repos_enabled: true
diff --git a/env/galaxy/group_vars/cvmfsstratum1servers/vars.yml b/env/galaxy/group_vars/cvmfsstratum1servers/vars.yml
@@ -3,7 +3,7 @@
 cvmfsstratum1servers_group_authorized_key_users: "{{ vault_cvmfsstratum1servers_group_authorized_key_users }}"
 
 # in MB
-cvmfs_stratum1_cache_mem: 2560
+cvmfs_stratum1_cache_mem: 14336
 
 cvmfsstratum1servers_group_users:
   - name: g2test

diff --git a/env/galaxy/group_vars/dockerswarmmanagers/vars.yml b/env/galaxy/group_vars/dockerswarmmanagers/vars.yml
@@ -1,5 +1,6 @@
 ---
 
+dockerswarmmanagers_group_groups: "{{ vault_dockerswarmmanagers_group_groups }}"
 dockerswarmmanagers_group_users: "{{ vault_dockerswarmmanagers_group_users }}"
 dockerswarmmanagers_group_authorized_key_users: "{{ vault_dockerswarmmanagers_group_authorized_key_users }}"
 dockerswarmmanagers_group_private_key_users: "{{ vault_dockerswarmmanagers_group_private_key_users }}"

diff --git a/env/galaxy/group_vars/dockerswarmmanagers/vault.yml b/env/galaxy/group_vars/dockerswarmmanagers/vault.yml
@@ -1,25 +1,33 @@
 $ANSIBLE_VAULT;1.1;AES256
-66343035616666326661393533356636373134323335653931623663663032643266653163366166
-3062346439633938393366343930613934663739346133340a626535313534653961333638613537
-63336330613661363966663837613832366666663639623661396138353135316465323362393930
-6230336461336665610a656561346138326539623966643036373537613964353436636265616433
-65383231363139306139646564626431326165623031626266303039383532346131333837303738
-32363239643962336533366233366130613032366566323761383732636438396165386631623930
-61353265396134373766333535366133663362363035306134393836663031363031333433353934
-61386432373634346630326361313832653930313630343432303832653033363662613161323862
-63643065336330313632303238376231653737336565333538393334373933666662366335636539
-64666164303137626366316431346633393530316366396263373461353135303236333661313338
-35663263626664623662353633356431633939653461396137386665633034353036343866333765
-36323862373131646233353464616634666232376637636634336634316434323962613566616634
-66666162663166373039383163396235313532363338663261343033326564363861363331623933
-39356130353861383536646163323639656235333664633638343239343437323962323265653931
-35303763616636303862633037333465636561373433623064333261313266323062316230316634
-37363530383833626561613436393531326264623033646564373438636664393236326265313534
-39663839663133636639343133386461623239643062373762633833393639653864623236653432
-63636636633932333063356661333139653334396165353035376466323535383139336565326462
-36613335383635653365383636333365636462643363653439623063343733343762363030323438
-39653038316434666337303634633862346365626365633734623462386165363164643136323337
-63383131666233393334356466306235393938346161646339383439613332306235623339363961
-34333065373362623432346439303033666630393762663135653931623935323632343230363662
-36346531333439383962623733326331323836376234616237663038616432373463313038376138
-35646335316438653563
+63383635383664373534346139306435363463656362623439396365666666373865333437663062
+3434323865653230326436326431643763306534373936380a663665626462613566396365366466
+34316466646236656236366366343434373037663439636362623835383138303236383637396132
+3966396331303063370a663635636162653761633963313837313931343333343835323838363665
+65633666663835383364626133336261666237333635613430383436353633636166623134653932
+66316465316230386131303037393666363435326465663366303966336130306438373635326136
+37353230663439316133656437356435396134643934663230313134656134343233383836316162
+64616432326466666665323738306137323662313564323538643264666363383062393462316132
+30643064653638313864643931316432366136333737646637373835363333326331366536633430
+61626530366138323962346630323465376461313036396634336561393638323732373061326230
+34303133316335633761663730376161653537643939383232356561323331316665363063613038
+65326334343737633539363963653661636362646661393665386139636539653534323634646462
+63626435396335333135313030383766333832383437373732306631643136393763393831663831
+32663733383464356133636366633866363633386466643232623864336465663230366131353734
+63376237623566613263613865366261653562366530663737643036636333353237393636336235
+32663138356236353461303435383539626365663562626636653664326530383263653966623762
+61343865383733353863613636396134363939633231623938613232306263316266363661616163
+32343465373765633166636136326261393331626432646232393832663831303266346662303332
+62633434313135306435343733376232333036343538616539663936386232663635366230303464
+32653165643135613131383631366631643735326531313438366162366135626334303233356666
+33656663636138396232346466316663333832653736623934663932643730303565653235386638
+61353832303661616639306364656436663063306231326136333338623565363066623131353664
+61653436323031313338666430386235303336396637303565323036386339663961646261653763
+66396335323634643332343066633366356662336362626336373536656666373032336139343261
+64623038353730386238386263353632646436333032656434346665356436623735333166306234
+34313031623534613035353836373736343462393534393735346431343836383338396435373838
+34333539646439623965323430633331323437326364636339316364623639363339323663346638
+30343264353633616564326266366334386635303261353863666139333339303735313033373661
+39636638633938333739343562346662616232333035616261376632356334356131363032383034
+36363662653365643961336339363162656363393335303338666433306465643664316335303832
+36663030626637393063363432303762353633643030643936373266323632343033353562326262
+32636333613836383765
diff --git a/env/galaxy/group_vars/jetstreamhosts/vault.yml b/env/galaxy/group_vars/jetstreamhosts/vault.yml
@@ -1,9 +1,14 @@
----
-
-vault_jetstreamhosts_group_authorized_key_users:
-  - name: centos
-    authorized:
-      - cathy_riemer
-      - dannon_baker
-      - nate_coraor
-      - richard_burhans
+$ANSIBLE_VAULT;1.1;AES256
+62383036616139663634626264373335623061616562656630393966653138383236653764303331
+3961316437306430663338613230316535346566336238610a353537613963633332343061613839
+61613935326539303363393135666336323064373635623937396236393665666232663038303933
+6165366339353533640a613462333838343535393862323937323339643666643338346531323237
+37353837646233616463363033343238303536386235613339653531313964336262366363656131
+30303231393033323364656332336565373563646434653938376130333065396335626366333837
+63636364623565353937653234646236386133393864656230336639663030646165326436633565
+38386438656161353139366166633161303330336536663363636637653634353139613365313036
+38356234396534333735613564383765303738313536383433656138363564343064303535666536
+62613238306661633165646630386133626362326261323962623763383363643631393133323136
+37653031646237333931306238663965333163303231356236656636333434633533333734396638
+38643430396262303462316561363335663538633761306166303239313161383664643963396230
+3338
diff --git a/env/galaxy/inventory b/env/galaxy/inventory
@@ -40,6 +40,7 @@ baseenv-nomail
 [sshservers]
 [sshservers:children]
 baseenv
+jetstreamhosts
 
 # For things that need access to env-specific sshprivatekeys
 [sshclients]
@@ -95,6 +96,7 @@ duvel.galaxyproject.org
 
 [virtual:children]
 ec2hosts
+jetstreamhosts
 
 [ec2hosts]
 delirium.galaxyproject.org

diff --git a/env/galaxy/playbook.yml b/env/galaxy/playbook.yml
@@ -159,14 +159,10 @@
 - name: Tasks for CVMFS Servers
   hosts: cvmfsstratum0servers:cvmfsstratum1servers:cvmfslocalproxies
   roles:
-    # mounts /srv
-    - role: paths
-      tags: cvmfs
     # need epel for the jq package
-    - role: geerlingguy.repo-epel
-      tags: cvmfs
-    - role: cvmfs
-      tags: cvmfs
+    - geerlingguy.repo-epel
+    - galaxyproject.cvmfs
+  tags: cvmfs
 
 - name: Tasks for Docker Swarm managers
   hosts: dockerswarmmanagers

diff --git a/env/jsiu/group_vars/all.yml → env/jsiu/group_vars/all/vars.yml b/env/jsiu/group_vars/all.yml → env/jsiu/group_vars/all/vars.yml
@@ -1,11 +1,28 @@
 ---
 
 cloud_id: jetstream_iu
+clouds_yaml: "{{ vault_clouds_yaml }}"
+openstack_privatekeys: "{{ vault_openstack_privatekeys }}"
+all_authorized_key_users: "{{ vault_all_authorized_key_users }}"
+
+openstack_image: JS-API-Featured-CentOS7-May-11-2018
+
+# This turns out to be unnecessary
+#openstack_userdata: |
+#  #cloud-config
+#  manage_resolv_conf: true
+#  resolv_conf:
+#    searchdomains:
+#      - jetstreamlocal
+#      - galaxyproject.org
+#    domain: galaxyproject.org
 
 # FIXME stop duplicating this between IU/TACC
+controller_name: "{{ cloud_id | replace('_', '-') }}0"
+controller_ip: "{{ hostvars[groups.controllers[0]]['ansible_default_ipv4']['address'] }}"
 slurm_cluster_name: "{{ cloud_id | replace('_', '-') }}"
-slurm_controller_name: "{{ slurm_cluster_name }}0"
-slurm_controller_ip: "{{ hostvars[groups.controllers[0]]['ansible_default_ipv4']['address'] }}"
+slurm_controller_name: "{{ controller_name }}"
+slurm_controller_ip: "{{ controller_ip }}"
 
 galaxy_cvmfs_repos_enabled: yes