Merge pull request #334 from edx/jrbl/edx-west-updates

Stanford: correcting prod variables

playbooks/edx-west/cme-prod-app.yml

@@ -24,7 +24,7 @@
     secure_dir: '../../../edx-secret/ansible'
     # this indicates the path to site-specific (with precedence)
     # things like nginx template files
-    local_dir:  '../../../../../../edx-secret/ansible/local'
+    local_dir:  '{{ secure_dir }}/local'
     not_prod: true
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_cme_vars.yml"
@@ -32,7 +32,7 @@
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
   roles:
     - common
-    - nginx
-    - {'role': 'edxapp', 'openid_workaround': true}
+    - {'role': 'nginx', 'nginx_conf': true}
+    - {'role': 'edxapp', 'openid_workaround': true, 'template_subdir': 'cme'}
     # run this role last
     # - in_production

playbooks/edx-west/prod-ora.yml

 # this gets all running prod webservers
 #- hosts: tag_environment_prod:&tag_function_ora
 # or we can get subsets of them by name
-- hosts: ~tag_Name_ora(10|11)_prod
+#- hosts: ~tag_Name_ora(10|11)_prod
+- hosts: ~tag_Name_ora10_prod
+#- hosts: ~tag_Name_ora11_prod
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True
   vars: