Use inheritance vars for directories and links.

galaxyproject · Apr 11, 2018 · fa3ed84 · fa3ed84
1 parent 50e71d7
commit fa3ed84
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/common_roles b/common_roles
diff --git a/jetstreamiuenv/group_vars/controllers.yml b/jetstreamiuenv/group_vars/controllers.yml
@@ -1,6 +1,6 @@
 ---
 
-group_packages:
+controllers_group_packages:
   - git
   - tmpwatch
   # Pulsar deps
@@ -12,7 +12,7 @@ group_packages:
   - openssl-devel
   - slurm-drmaa
 
-group_files:
+controllers_group_files:
   - src: files/etc/dhclient.conf
     dest: /etc/dhcp/dhclient.conf
     backup: yes
@@ -28,7 +28,7 @@ group_files:
 
 jetstream_scratch0_device: /dev/sdb
 
-directories:
+controllers_group_directories:
   - path: /jetstream
   - path: /var/lib/slurm
     mode: "0755"
@@ -48,7 +48,7 @@ directories:
   - path: /galaxy-repl
   - path: /galaxy-repl/main
 
-links:
+controllers_group_links:
   - path: /jetstream/scratch0
     src: /scratch0
     force: yes

diff --git a/jetstreamiuenv/group_vars/galaxynodes.yml b/jetstreamiuenv/group_vars/galaxynodes.yml
@@ -3,18 +3,18 @@
 # 100 GB
 cvmfs_quota_limit: 100000
 
-group_packages:
+galaxynodes_group_packages:
   - collectl
   - lzo
 
-directories:
+galaxynodes_group_directories:
   - path: /galaxy-repl/test
   - path: /galaxy-repl/main
   - path: /var/lib/slurm
     mode: "0755"
 
 # symlinks for deps must exist due to path issues
-links:
+galaxynodes_group_links:
   - path: /galaxy
     src: /galaxy-repl
     force: yes

diff --git a/jetstreamtaccenv/group_vars/controllers.yml b/jetstreamtaccenv/group_vars/controllers.yml
@@ -1,6 +1,6 @@
 ---
 
-group_packages:
+controllers_group_packages:
   - git
   - tmpwatch
   # Pulsar deps
@@ -13,7 +13,7 @@ group_packages:
   # FIXME: slurm-drmaa can't be installed on first playbook run because the depot repo is set up by the slurm role
   - slurm-drmaa
 
-group_files:
+controllers_group_files:
   - src: files/etc/dhclient.conf
     dest: /etc/dhcp/dhclient.conf
     backup: yes
@@ -30,7 +30,7 @@ group_files:
 
 jetstream_scratch0_device: /dev/sdb
 
-directories:
+controllers_group_directories:
   - path: /jetstream
   - path: /var/lib/slurm
     mode: "0755"
@@ -50,7 +50,7 @@ directories:
   - path: /galaxy-repl
   - path: /galaxy-repl/main
 
-links:
+controllers_group_links:
   - path: /jetstream/scratch0
     src: /scratch0
     force: yes

diff --git a/jetstreamtaccenv/group_vars/galaxynodes.yml b/jetstreamtaccenv/group_vars/galaxynodes.yml
@@ -3,18 +3,18 @@
 # 100 GB
 cvmfs_quota_limit: 100000
 
-group_packages:
+galaxynodes_group_packages:
   - collectl
   - lzo
 
-directories:
+galaxynodes_group_directories:
   - path: /galaxy-repl/test
   - path: /galaxy-repl/main
   - path: /var/lib/slurm
     mode: "0755"
 
 # symlinks for deps must exist due to path issues
-links:
+galaxynodes_group_links:
   - path: /galaxy
     src: /galaxy-repl
     force: yes

diff --git a/taccenv/group_vars/all.yml b/taccenv/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 
-links:
+all_links:
   - path: /galaxy
     src: /galaxy-repl
     force: yes

diff --git a/taccenv/group_vars/galaxyservers.yml b/taccenv/group_vars/galaxyservers.yml
@@ -1,18 +1,18 @@
 ---
 
-group_groups:
+galaxyservers_group_groups:
   - name: gxsrc
     gid: 493
 
-group_users:
+galaxyservers_group_users:
   - name: gxsrc
     group: gxsrc
     groups: G-803372
     uid: 493
     home: /home/gxsrc
     shell: /bin/bash
 
-directories:
+galaxyservers_group_directories:
   - path: /srv/nginx/{{ galaxy_instance_hostname }}/root
     owner: gxsrc
     group: gxsrc
@@ -44,13 +44,13 @@ directories:
     owner: "{{ galaxy_user }}"
     group: G-803372
 
-group_files:
+galaxyservers_group_files:
   - src: files/monitoring/mailoom.py
     dest: /root/mailoom.py
     owner: root
     group: root
 
-group_crontabs:
+galaxyservers_group_crontabs:
   - id: mail_oom_killer
     name: Mail OOM Killer log messages
     user: root
@@ -60,14 +60,14 @@ group_crontabs:
     job: "/usr/bin/python /root/mailoom.py --oom --mail galaxy-system@lists.galaxyproject.org"
 
 # node, npm for GIE proxy
-group_packages:
+galaxyservers_group_packages:
   - nodejs
   - npm
   - '@development tools' # for npm modules
   - collectl
   - slurm-drmaa
 
-group_yum_repositories:
+galaxyservers_group_yum_repositories:
   - name: docker
     state: absent
 

diff --git a/taccenv/host_vars/galaxy-db-02.tacc.utexas.edu/vars.yml b/taccenv/host_vars/galaxy-db-02.tacc.utexas.edu/vars.yml
@@ -2,7 +2,7 @@
 
 authorized_key_users: "{{ vault_authorized_key_users }}"
 
-directories:
+host_directories:
   - path: /home/g2main/bin
     owner: g2main
     mode: "0755"