Update list of public keys that get included on CentOS boxes (to incl…

ansible.cfg

@@ -1,4 +1,6 @@
 [defaults]
+host_key_checking = False
+callback_whitelist = profile_tasks
 
 # include roles from galaxyproject/ansible-common-roles
 roles_path = roles:common_roles
@@ -17,3 +19,6 @@ pipelining = True
 # These are necessary for cloud instances
 #pipelining = False
 #ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
+
+[paramiko_connection]
+record_host_keys = False

jetstream_common/files/elasticity/elasticity_kp

@@ -0,0 +1,90 @@
+$ANSIBLE_VAULT;1.1;AES256
+64646363613565643537363537623663373961326364366636343061323666396235326430623538
+6263373731333466383561386139653035313362326237660a366639333261643337643332666164
+32326564623561663435666162343930396634656130313039363930353664666336323839356339
+3566623532316233630a333936353261643865633236323930363132613433366236663638666535
+65376430393663326237626239373365363263316664353163653664363932383134633539303764
+38363132616265633134656362616466396635383534336133333333613566666638303936643566
+65393431656337323965623564613366346130663233663761306662373466313364363366393561
+32393964643664386132313139366630326535323137636235393234383861376632613339613961
+39376231303465383131333035383262383032333031303963616336363738616435313534363561
+62336532633861303438396263663339653436653566633436353232326532633237343566346338
+61633837623235653465623635363338643662616265393935373532653237616366613637633631
+35636237633433623863393766396430386264623631656336663661633037306262376666386130
+37343938393766643534333662633436386635343262333263343236356639333035396138656166
+63623334373930356139653664623633316437616233366339623039386633373438386530373531
+33633265353030376162363938333038343432626565363463643137353635613933313433383561
+33623938623530643062656266336630366131383839636562636364303364323366653837663935
+39366532353635323137353631383132323435616636366636653965343637616164653236323662
+38643537643262653032393963303861326239303064396363376262346439346264356435316561
+39666461303234663136363264343962356539333632343336646637633533303638373536313064
+32353532396162356535353634333236646162633463616335653665333833323331396264346362
+36633332396164316663353439343737316631376666633862366232353535623135303232323838
+36373164303062613030336363306336343762313534626265663064633632303131373730333532
+36343439646238303531633862363361663431623934396566393733353838666564316162623730
+66313263313037376635393937333266636561636634663136623661626530316164633536646339
+38653937383866303065313637366138623933336236636138383236333439616463343863623139
+66396336353439656237313336636462366364653038316662353465336130383433633363313633
+62353264373835393265323131363137353139313833373335363366373636346639313538653436
+63306535633665303735323732373266663864326666666239393134636530323061636466393530
+32366630376661613637626362396434623332613561383838356264623863383561303564333936
+30383834303661366536313038323864383438396438373661656236363566366334343237306665
+65343537626639386161373830643866336639383765353363363465643732333366623562356262
+30636535306630373165363639316363643835313765313562343835396461333733613130383865
+30313866666633373432626361393633616534356132663165356332326635336438316463303035
+62653439663534393336363635613163383630363565366562616331646164313139653333376633
+34333062653436383463346561343934333865386436666265366537613464613530383532323231
+35363638343466656630333334633432653164393936346139633233646334653631386131356537
+37616165353965633333353031666166363737363366616261373532666136363330353263623362
+35636636306431316336623233383966633939636264653432643865393463383130386134323736
+63623663623230346266343839386132303631343036333334393135643464393837326234623238
+33306330313237386362623265376232343630653535313532376563373031616635326635653336
+63303232623166663866313539333337323839643934366363333733636437623163366233383062
+34306133373238333963626333363830626261333235376465373661643532336530623431313731
+61383634376437373135353831376364306639646565346234386265656333396337646233643937
+65343336356531633534353033663135666136653565303764346264326437643331643331623939
+37313336616438323538623765303635303637313263636131353965316434653837306466393836
+61373464306133613164383236333230363139643061623338363965333230613963356230313939
+37396131326634613164393231636635303633373461376134323630383336323961663137636264
+62643463643132363634353164383232613866356630366536393039653465366230636234386566
+39393032396462663634353739336664646561396361633431336638316266303837313633363263
+37656235623462646166643132326462373930656465646436346333343234363339656136373431
+33306466613861633632643063656266313762333931383335636137386165643237396564356635
+61383934386239616638623333626532373966623163373466326466643964363733666134656562
+35653963613064383336363338323766646436663932376131653664313964366139313130643733
+61326131613336356430346432356166653466333534333136356533613939376333613237616362
+64626638396263356138343132333633613261386430313932653536303565663535336631333830
+36653436616539363065383335366435626138633037383832366434316530613938383138303964
+38306334346638376639313763383934633931656530393761373833396565333566656130356662
+30636431663365616532383764386338356137643736356431393536346635313265616338633630
+61386432343630333734353834316664326431363335626365663335346239313633363135643563
+64646135363630396630616161326334393439613431636231353831613061323963353434643136
+37323865343361306165343534323831613234383432303632333039643835336664396564306161
+62366331653061363931313634333131366531613464383065316362393964323030643432623666
+30386634646633376236643062393032643265376536303263313562653165643531613066396363
+38666138316532626434303161316262646230373164656639306264303430323461643536653033
+38333034356464336538653130323036646235376437346436383339333963633438343965636132
+33316465356634343633363131663533336139343134323265633061326431653137343261653232
+34666162626262373032316633643339376334613836656464623236653938343535623962396539
+36653034343930393163663431393732306264316662316230663564336361653665356566616165
+62646530623561613466303362383562663065346533306338633065613437666236623161326530
+66656535356635646661313966386437653366613661656138366664373162336333373932613765
+30323861326531333735626537393036633931343962663031663561333336333634333938323134
+31303630306137626130323731616432353635343365333666383639623064376264346536353738
+61656337313632383564336439363536636430396335653234376662393465653832363436366635
+65373536376631353633336230353236343666366636666236386264343136623963376539323431
+38656332353933623631316338393939313766636537333564346234613238613065626566613366
+63646533326136326462623439313232616534646139373961386439616563333164656565626137
+37653538636430663265356364363763626532386262353861666266323330303965323939336465
+33303931353830333565666163373766353265653464616462623165616335663764316237356335
+31393165323331356136306662393462336562353635323734313963626337393662323932666361
+30656664353465623031623631343264613662316266363364373634313966643839303136386564
+62643862326566383333326462646131626461316238383561653531333062663333653134326463
+33313566653963393330363337303435353531656461663436663161336631326533633834346536
+39323464363930636631323163653333623565613134393366656336633664613563623339366531
+61353436623466316664373135623334396432626163353065646536613331363865393436333339
+35383132383731373539373632366633643063636664316630383935376262636561376338336639
+62326636393664373736393635663833663530376633633431613765313430393162306431363463
+64383435386262363764663434633264333666383335356361643836383766353933643930336132
+66323139363630343463623765626138666531613431343733383331366132323234396237376535
+3562

jetstream_common/files/elasticity/elasticity_kp.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpw4D9NR0at80ehc84kTchP2aDCV9HbZetptVCwc2/sdzUHvecUXNRc61RYKttF3kdgWO8UhGWjUUjNCMOR/gYxV1Ui1hpihFExdg2tHbXpkArdrHJK6n+QWf7qYrNTLFVFH2XVxouzJ4k37slGNeQMWczRHS2ZUL+cbfYOEWe8RhWRqhRjvAdxLnQt1dg/sKc0MqeDwEVAmdgNHUozbeUxKVVsoxWBeUiLK7xTd0PQ/jXRVWY1pYQ2xfjvhm1DiylQO/5fox8Z5MmyqBSAsKdGgfe47K335QmmrEKtq/6O1AAnm6D0Pkqky3EgzT7g/DpT2n8VyCWAdFIvrQAg65V Generated-by-Nova

jetstream_common/files/elasticity/vp

@@ -0,0 +1,7 @@
+$ANSIBLE_VAULT;1.1;AES256
+39343936396638626438353764366237336637336537383966393234303534393730303635653564
+3837353262653931633761336561623666653464303032630a323933393438376438663332666238
+34333133326533313136363935373837376538636230653239353430356330633037393766373763
+3031376537643338370a333939656563646539356563306666306131303638666666633036383161
+34636336623039376638633430353138363031366230633833633234616238613165303534336464
+3634326232303961313037333636646562393732666334653033

jetstream_common/files/slurm/launch

@@ -9,13 +9,13 @@ LOG_DIR=/var/log/slurm/launch
 set -xv
 
 VENV=/opt/slurm_cloud_provision
-PLAYBOOK=/home/centos/infrastructure-playbook
+PLAYBOOK=/opt/slurm_cloud_provision/infrastructure-playbook
 
 : ${HOME:=/var/lib/slurm}
 export HOME
 
 . $VENV/bin/activate
 cd $PLAYBOOK
 instances=`scontrol show hostnames "$1" | tr '\n' ',' | sed 's/,$//'`
-ansible-playbook -i jetstreamenv/instance_inventory jetstreamenv/launch.yml --vault=/var/lib/slurm/.vault-pass --extra-vars="jetstream_instances_to_launch=$instances"
+ansible-playbook -i jetstreamiuenv/instance_inventory jetstreamiuenv/launch.yml --vault=/var/lib/slurm/.vault-pass --extra-vars="jetstream_instances_to_launch=$instances"
 ) 2>&1 | tee "$LOG_DIR/launch.`date +%s`.${1}.log"

jetstream_common/files/slurm/terminate

@@ -9,14 +9,14 @@ LOG_DIR=/var/log/slurm/launch
 set -xv
 
 VENV=/opt/slurm_cloud_provision
-PLAYBOOK=/home/centos/infrastructure-playbook
+PLAYBOOK=/opt/slurm_cloud_provision/infrastructure-playbook
 
 : ${HOME:=/var/lib/slurm}
 export HOME
 
 . $VENV/bin/activate
 cd $PLAYBOOK
 instances=`scontrol show hostnames "$1" | tr '\n' ',' | sed 's/,$//'`
-ansible-playbook -i jetstreamenv/instance_inventory jetstreamenv/terminate.yml --vault=/var/lib/slurm/.vault-pass --extra-vars="jetstream_instances_to_terminate=$instances"
+ansible-playbook -i jetstreamiuenv/instance_inventory jetstreamiuenv/terminate.yml --vault=/var/lib/slurm/.vault-pass --extra-vars="jetstream_instances_to_terminate=$instances"
 ) 2>&1 | tee "$LOG_DIR/terminate`date +%s`.${1}.log"
 true

jetstream_common/launch.yml

@@ -8,14 +8,14 @@
   tasks:
     - name: Launch new instance(s)
       os_server:
-        cloud: jetstream_iu
+        cloud: jetstream_iu  # Details defined in clouds.yaml, including auth
         name: "{{ item }}"
-        image: "CentOS 7 Stock 1601"
-        flavor: "m1.large"
-        key_name: "slurm_jetstream0"
-        security_groups: "default,usegalaxy-control"
+        image: "{{ worker_image_id }}"
+        flavor: "{{ worker_instance_type }}"
+        key_name: "elasticity_kp"
+        security_groups: "gxy-workers-sg"
         nics:
-          - net-name: "usegalaxy"
+          - net-name: "gxy-slurm-net"
         auto_ip: no
       with_items: "{{ jetstream_instances_to_launch.split(',') }}"
       register: jetstream_instances_launched
@@ -29,7 +29,8 @@
       add_host:
         name: "{{ item.server.name }}"
         ansible_host: "{{ item.server.private_v4 }}"
-        groups: "baseenv,galaxynodes,slurmclients,slurmexechosts"
+        groups:
+          "baseenv,galaxynodes,slurmclients,slurmexechosts,jetstreamnfsclients"
       with_items: "{{ jetstream_instances_launched.results }}"
 
     - name: Spin waiting for instance(s) to become accessible

jetstream_common/playbook.yml

@@ -5,6 +5,7 @@
   remote_user: centos
   become: yes
   become_method: sudo
+  connection: paramiko
   pre_tasks:
     - name: Locate secret group variable files
       local_action:
@@ -65,7 +66,7 @@
         dest: /etc/hosts
 
 - name: Install supervisor
-  hosts: all
+  hosts: controllers
   remote_user: centos
   become: yes
   become_method: sudo

jetstream_common/secret_group_vars/clouds.yaml

@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+39376264656237656561343363313364633637376535386130343039643136636636613964333961
+3231323431356661333264646533343630633437376531640a313961613938343931653861316431
+38313665363931633832613133663438323933663135386262613732303863356464326262356134
+6636633333363938330a343964636437363961613162323635393033616633323838383835616565
+38633030373232636233376132653462613664343436313934653566386332376436376461333063
+35333030353737366530303635643861333166353736353039386130316662376439633239626534
+66636636346232303263656339306135626238633461643832373933343762653839613434636134
+35343939613332653431346664633737373363613537323734323637653466663039313136353734
+32313930376332363733383462656336323635616139366364663236393663316534656466323532
+38346430613236326238313463363262643836643533643331316331653665646430343637303566
+65323536373864623538336336383938363865626432333939353766666433646433663239363830
+65336430666636656335383065356638653534663865383639323562306232353932626166636261
+39353933323365326133623264653332373533396638326330623161666637613936306465666162
+39623136373339383261326366376231666437666362613464326333396332326266323934626232
+31363466653636326362393532666139633039393533343130373864313364326562333238336435
+38333031326231656334323065663366616133623637306434323461393633613064383133653731
+3738