Deduplicate

env/jscommon/group_vars/all/vars.yml

@@ -0,0 +1,48 @@
+---
+
+clouds_yaml: "{{ vault_clouds_yaml }}"
+all_authorized_key_users: "{{ vault_all_authorized_key_users }}"
+
+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: "{{ controller_name }}"
+slurm_controller_ip: "{{ controller_ip }}"
+
+slurm_user:
+  uid: 40302
+  gid: 40302
+  comment: 'Slurm Workload Manager'
+  home: /var/lib/slurm
+  shell: /bin/bash
+
+galaxy_cvmfs_repos_enabled: yes
+
+all_groups:
+  - name: G-803372
+    gid: 803372
+  - name: TACC-ACS
+    gid: 814239
+
+all_users:
+  - name: g2test
+    group: G-803372
+    groups: TACC-ACS
+    comment: 'Galaxy Test Server'
+    uid: 819456
+    home: /home/g2test
+    shell: /bin/bash
+  - name: g2main
+    group: G-803372
+    groups: TACC-ACS
+    comment: 'Galaxy Main Server'
+    uid: 819800
+    home: /home/g2main
+    shell: /bin/bash
+
+all_yum_repositories:
+  - name: galaxy_gpel
+    description: Galaxy Packages for Enterprise Linux $releasever - $basearch
+    baseurl: https://depot.galaxyproject.org/yum/el/$releasever/$basearch/
+    enabled: yes
+    gpgcheck: no

env/jscommon/group_vars/all/vault.yml

@@ -0,0 +1,41 @@
+$ANSIBLE_VAULT;1.1;AES256
+36313238356531663132396563346162633465396336633634376536656662386565343039626636
+3237396464336134336463383931303239343031613266380a653962336665646336303139393163
+30326538333737613133356636643136386332313337313331313832626639393061313433343463
+3933646239396536350a393431653064616438346562653934373736613631373437633835656262
+36383865623634373663656130336438613031326337663132363237386334303062616665353033
+34626165303661613138653562383537613164346137663766373930363430393465623264643236
+61663438616364616262323265373661333836633461376639383764393636376334393631373166
+37366533333431643465303364306632613033386163636236353638376361316465323762323165
+63626663316262636338343732326638393639623735336439356463333164353731313939653163
+66323537346233303938316437383738623936383434306263336636336461316338613364613436
+61646230663430383237636630333864333039336438313931363333633532366531633738623635
+39643366666631666562333165376139343833613536343434653563663466653064663566313862
+37316236616232656333363730623966373236633865333837613536666239373166313930383035
+39623030396466383433623230396533653432386339633364363033306662626530663665646139
+61326662313663393065663137646562633535623839626138653566333466373538363066373939
+64626531656632636237626433306439613633366637666436326563393766336264373063656339
+34653334356164646566643165666331343161376639656534613166303632383032316439303065
+39356337373766656537336562643937333466656532633639636563346563363536356335313962
+39323364613036393637333830636261383932306465383261383733376435633933383062333134
+64303661623666643931643531323462336537653561363365343530396235326437376435393662
+64303131613666663237623137363361646233303165383265346234373364396163646335333531
+61393634633037323463316230376336333961383633333364643864323361643633316134353433
+33626466333835633861343932636232396131393661353839353061623438396630636362646566
+63373262343639333536386131386161366138336165363837306536313931356536346564653538
+65313034666233393738323231383339656135313239343330643533636366346635323338393165
+32373137663433383562316234366132316237666538346563323862363262336363633665626538
+63353038383836633836376538393230643663633235346633643930303237333638623838356232
+66303230636132623431356536383763366231336236373932356533313266626564633339303663
+34636435343736383831306665356366306638323662666365373066316635373438663336376264
+62666231626439653738363063356664623933343734626338643565376137393931323738343961
+32646266646532353833663133363039313961396536316636326532376662386534303533313335
+34393166623332373239383530333137306637313430353338666539383062636537353233663135
+37343838646462336435353435633065366431346561373564356137323733326638613434623665
+61626566336663363035393863623666666461303762383137326361333537363363306536333964
+39666362623262373738396239353034353464343938316638323435333063356633333434613938
+36626135386563363962623962306366306362333936613561393265323833373537376464303337
+61356462373832653465363866353466636532343231633662366464333235353161636536343634
+33306638333133666332663939376439396566306539613437326236303035363233313764646637
+35633663393431363130333534313562633164383938313938316132303761333931383732373933
+64303837383439623236

env/jscommon/group_vars/controllers.yml

@@ -1,9 +1,119 @@
 ---
 
+slurm_scale_user: slurm
+slurm_ssh_key: "{{ openstack_privatekeys.slurm }}"
+
+ansible_ssh_private_key_file: "{{ inventory_dir }}/{{ openstack_key_name }}.pem"
+
+_scratch_vol_name: "{{ inventory_hostname_short }}-scratch0"
+
+openstack_cloud_id: "{{ cloud_id }}"
+openstack_clouds_yaml: "{{ clouds_yaml }}"
+openstack_secrets:
+  - dest: "{{ openstack_key_name }}.pem"
+    content: "{{ openstack_privatekeys.admin }}"
+
+openstack_flavor: m1.medium
+openstack_key_name: admin-kp
+openstack_nics:
+  - net-name: usegalaxy
+openstack_security_groups:
+  - default
+  - docker
+  - usegalaxy-control
+openstack_floating_ips:
+  - "{{ lookup('dig', inventory_hostname) }}"
+openstack_volumes:
+  - name: "{{ _scratch_vol_name }}"
+    size: 10000
+
+cvmfs_quota_limit: 1024
+
+filesystems:
+  - dev: "{{ openstack_volume_map[_scratch_vol_name] }}"  # this is collected by os_server
+    fstype: xfs
+
+mounts:
+  - name: /jetstream/scratch0
+    src: "{{ openstack_volume_map[_scratch_vol_name] }}"
+    fstype: xfs
+
 controllers_group_authorized_key_users:
   - name: centos
     authorized: "{{ galaxy_admin_users }}"
   - name: g2test
     authorized: "{{ galaxy_team_users }}"
   - name: g2main
     authorized: "{{ galaxy_team_users }}"
+
+controllers_group_packages:
+  - vim
+  - git
+  - tmpwatch
+  # Pulsar deps
+  - '@development tools'
+  - python-virtualenv
+  - libffi-devel
+  - libcurl-devel
+  - nss-devel
+  - openssl-devel
+  - slurm-drmaa
+
+controllers_group_files:
+  - src: files/etc/dhclient.conf
+    dest: /etc/dhcp/dhclient.conf
+    backup: yes
+    mode: "0644"
+    owner: root
+    group: root
+  - src: files/etc/ifcfg-eth1
+    dest: /etc/sysconfig/network-scripts/ifcfg-eth1
+    backup: yes
+    mode: "0644"
+    owner: root
+    group: root
+
+controllers_group_directories:
+  - path: /jetstream
+  - path: /var/lib/slurm
+    mode: "0755"
+  - path: /srv/pulsar/test
+    owner: g2test
+    group: G-803372
+  - path: /srv/pulsar/test/pulsar/log
+    owner: g2test
+    group: G-803372
+  - path: /srv/pulsar/main
+    owner: g2main
+    group: G-803372
+  - path: /srv/pulsar/main/pulsar/log
+    owner: g2main
+    group: G-803372
+  # see comment in links
+  #- path: /galaxy-repl
+  #- path: /galaxy-repl/main
+
+#controllers_group_links:
+#  # if Conda is reinstalled in CVMFS with /cvmfs paths (as was done with Test) these symlinks are unnecessary
+#  - path: /galaxy
+#    src: /galaxy-repl
+#    force: yes
+#  - path: /galaxy-repl/main/deps
+#    src: /cvmfs/main.galaxyproject.org/deps
+#    force: yes
+
+supervisord_install: package
+supervisord_group_configs:
+  - pulsar
+
+controllers_group_crontabs:
+  - id: clean_scratch
+    name: Clean Test Scratch
+    user: g2test
+    minute: 05,20,35,50
+    job: /usr/bin/tmpwatch --mtime --dirmtime 4d /scratch0/test/jobs
+  - id: clean_scratch
+    name: Clean Main Scratch
+    user: g2main
+    minute: 00,15,30,45
+    job: /usr/bin/tmpwatch --mtime --dirmtime 4d /scratch0/main/jobs

env/jscommon/group_vars/slurmclients/vars.yml

@@ -1,21 +1,3 @@
 ---
 
 munge_key: "{{ vault_munge_key }}"
-
-group_groups:
-  - name: slurm
-    gid: 40302
-
-group_users:
-  - name: slurm
-    group: slurm
-    comment: 'Slurm Workload Manager'
-    uid: 40302
-    system: yes
-    home: /var/lib/slurm
-    shell: /bin/bash
-
-slurm_yum_repo_baseurl: https://depot.galaxyproject.org/yum/el/$releasever/$basearch
-
-slurmd_spool_dir: /var/lib/slurm/slurmd/slurmd.spool
-slurmctld_state_dir: /var/lib/slurm/slurmctld/slurm.state

env/jsiu/group_vars/all/common_vars.yml

@@ -0,0 +1 @@
+../../../jscommon/group_vars/all/vars.yml

env/jsiu/group_vars/all/common_vault.yml

@@ -0,0 +1 @@
+../../../jscommon/group_vars/all/vault.yml

env/jsiu/group_vars/all/vars.yml

@@ -1,9 +1,8 @@
 ---
 
 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
 
@@ -16,41 +15,3 @@ openstack_image: JS-API-Featured-CentOS7-May-11-2018
 #      - 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: "{{ controller_name }}"
-slurm_controller_ip: "{{ controller_ip }}"
-
-galaxy_cvmfs_repos_enabled: yes
-
-all_groups:
-  - name: G-803372
-    gid: 803372
-  - name: TACC-ACS
-    gid: 814239
-
-all_users:
-  - name: g2test
-    group: G-803372
-    groups: TACC-ACS
-    comment: 'Galaxy Test Server'
-    uid: 819456
-    home: /home/g2test
-    shell: /bin/bash
-  - name: g2main
-    group: G-803372
-    groups: TACC-ACS
-    comment: 'Galaxy Main Server'
-    uid: 819800
-    home: /home/g2main
-    shell: /bin/bash
-
-all_yum_repositories:
-  - name: galaxy_gpel
-    description: Galaxy Packages for Enterprise Linux $releasever - $basearch
-    baseurl: https://depot.galaxyproject.org/yum/el/$releasever/$basearch/
-    enabled: yes
-    gpgcheck: no