Further updates Stanford needed to deploy

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

@@ -17,11 +17,17 @@
     - "{{ secure_dir }}/vars/edxapp_carnegie_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
-    - {'role': 'nginx', 'nginx_conf': true}
-    - {'role': 'edxapp', 'openid_workaround': true, 'template_subdir': 'carnegie'}
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
+      nginx_template_directory: "{{local_dir}}/nginx/templates/carnegie/"
+    - {'role': 'edxapp', 'openid_workaround': true}
     - datadog
-    - splunkforwarder
+    #- splunkforwarder
     # run this role last
     # - in_production

playbooks/edx-west/carnegie-prod-worker.yml

@@ -13,8 +13,9 @@
     - "{{ secure_dir }}/vars/edxapp_carnegie_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - { role: 'edxapp', celery_worker: True }
     - datadog
-    - splunkforwarder
+    #- splunkforwarder

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

@@ -30,6 +30,7 @@
     - "{{ secure_dir }}/vars/edxapp_cme_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - role: nginx
@@ -38,8 +39,9 @@
       - lms
       - cms
       - lms-preview
+      nginx_template_directory: "{{local_dir}}/nginx/templates/cme/"
     - {'role': 'edxapp', 'openid_workaround': true, 'template_subdir': 'cme'}
     - datadog
-    - splunkforwarder
+    #- splunkforwarder
     # run this role last
     # - in_production

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

@@ -13,8 +13,9 @@
     - "{{ secure_dir }}/vars/edxapp_cme_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - { role: 'edxapp', celery_worker: True }
     - datadog
-    - splunkforwarder
+    #- splunkforwarder

playbooks/edx-west/prod-app.yml

 # this gets all running prod webservers
 #- 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(10|20)_prod
+#- hosts: ~tag_Name_app(11|21)_prod
 ## this is the test box
 #- hosts: ~tag_Name_app4_prod
 ## you can also do security group, but don't do that
@@ -24,6 +24,7 @@
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
     - "{{ secure_dir }}/vars/shib_prod_vars.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - role: nginx
@@ -31,10 +32,11 @@
       - lms
       - cms
       - lms-preview
+      nginx_template_directory: "{{local_dir}}/nginx/templates/"
     - edxapp
     - apache
     - shibboleth
     - datadog
-    - splunkforwarder
+    #- splunkforwarder
     # run this role last
     - in_production

playbooks/edx-west/prod-ora.yml

@@ -3,7 +3,6 @@
 # or we can get subsets of them by name
 #- 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:
@@ -16,6 +15,7 @@
     - "{{ secure_dir }}/vars/ora_prod_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - role: nginx
@@ -23,4 +23,4 @@
       - ora
     - ora
     - datadog
-    - splunkforwarder
+    #- splunkforwarder

playbooks/edx-west/prod-worker.yml

@@ -14,11 +14,12 @@
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
     - "{{ secure_dir }}/vars/shib_prod_vars.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - { role: 'edxapp', celery_worker: True }
     - datadog
-    - splunkforwarder
+    #- splunkforwarder
 
 #
 # COMMENT OUT THE NOTIFIER UNTIL IT IS READY

playbooks/edx-west/prod-xqueue.yml

 # this gets all running prod webservers
-- hosts: tag_environment_prod:&tag_function_xqueue
+#- hosts: tag_environment_prod:&tag_function_xqueue
 # or we can get subsets of them by name
-#- hosts: ~tag_Name_xserver(1|2)_prod
+- hosts: ~tag_Name_xqueue11_prod
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True
   vars:
@@ -13,6 +13,7 @@
     - "{{ secure_dir }}/vars/xqueue_prod_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
     - common
     - role: nginx
@@ -20,4 +21,4 @@
       - xqueue
     - xqueue
     - datadog
-    - splunkforwarder
+    #- splunkforwarder

playbooks/edx-west/stage-app.yml

 - hosts: tag_environment_stage:&tag_function_webserver
-#- hosts: tag_Name_app1_stage
   sudo: True
   vars_prompt:
     - name: "migrate_db"
@@ -23,6 +22,7 @@
       - lms
       - cms
       - lms-preview
+      nginx_template_directory: "{{local_dir}}/nginx/templates/"
     - edxapp
     - apache
     - shibboleth

playbooks/roles/nginx/defaults/main.yml

@@ -17,6 +17,8 @@ nginx_lms_preview_gunicorn_hosts:
 nginx_cms_gunicorn_hosts:
   - 127.0.0.1
 
+nginx_template_directory: ""
+
 nginx_cfg:
   #   - link - turn on
   #   - absent - turn off

playbooks/roles/nginx/tasks/main.yml

@@ -29,7 +29,7 @@
   - nginx
 
 - name: nginx | Copying nginx configs for {{ nginx_sites }}
-  template: src={{ item }}.j2 dest=/etc/nginx/sites-available/{{ item }} owner=root group=root mode=0600
+  template: src={{nginx_template_directory}}{{ item }}.j2 dest=/etc/nginx/sites-available/{{ item }} owner=root group=root mode=0600
   notify: nginx | reload nginx
   with_items: nginx_sites
   tags: