Merge pull request #272 from edx/jbau/factor-out-xqueue-vars

Factor out xqueue vars into own vars file, plus minor changes

playbooks/edx-west/prod-app.yml

@@ -2,9 +2,9 @@
 #- hosts: tag_environment_prod:&tag_function_webserver
 # or we can get subsets of them by name
 #- hosts: ~tag_Name_app(10|20)_prod
-#- hosts: ~tag_Name_app(11|21)_prod
+- hosts: ~tag_Name_app(11|21)_prod
 ## this is the test box
-- hosts: ~tag_Name_app4_prod
+#- hosts: ~tag_Name_app4_prod
 ## you can also do security group, but don't do that
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True
@@ -18,6 +18,7 @@
     # this indicates the path to site-specific (with precedence)
     # things like nginx template files
     local_dir:  '../../../configuration-secure/ansible/local'
+    not_prod: false
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"

playbooks/edx-west/prod-xqueue.yml

@@ -10,7 +10,7 @@
     # things like nginx template files
     local_dir:  '../../../configuration-secure/ansible/local'
   vars_files:
-    - "{{ secure_dir }}/vars/edxapp_prod_vars.yml"
+    - "{{ secure_dir }}/vars/xqueue_prod_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
   roles:

playbooks/edx-west/stage-xqueue.yml

@@ -5,7 +5,7 @@
     secure_dir: ../../../edx-secret/ansible
     local_dir: ../../../edx-secret/ansible/local
   vars_files:
-    - "{{ secure_dir }}/vars/edxapp_stage_vars.yml"
+    - "{{ secure_dir }}/vars/xqueue_stage_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_stage_users.yml"
   roles: