updating plays for nginx refactor

playbooks/edx_jenkins_tests.yml

@@ -14,7 +14,14 @@
     - "{{ secure_dir }}/vars/edx_jenkins_tests.yml"
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
+      - xqueue
+      - xserver
+      - ora
     - edxlocal
     - edxapp
     - xqueue

playbooks/edx_provision_test.yml

@@ -26,7 +26,13 @@
     - "{{ secure_dir }}/vars/edx_jenkins_tests.yml"
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
+      - xserver
+      - xqueue
     - edxlocal
     - edxapp
     - xqueue

playbooks/edx_sandbox.yml

@@ -23,7 +23,12 @@
     openid_workaround: True
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
+      - ora
     - edxlocal
     - edxapp
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }

playbooks/edxapp_ref.yml

@@ -5,7 +5,11 @@
     - "{{ secure_dir }}/vars/edxapp_ref_users.yml"
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
     - gunicorn
     - edxapp
     - ruby

playbooks/edxapp_rolling_example.yml

@@ -15,7 +15,11 @@
         state: 'absent'
   roles:
     - common
-    - nginx 
+    - role: nginx 
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
     - edxapp
     - ruby
   post_tasks:

playbooks/vagrant-fullstack.yml

@@ -9,7 +9,13 @@
     - "group_vars/all"
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
+      - xserver
+      - xqueue
     - edxlocal
     - edxapp
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
@@ -26,4 +32,4 @@
       virtualenv_user_home: "{{ xqueue_user_home }}"
       virtualenv_name: "{{ xqueue_user }}"
     - { role: "xqueue", update_users: True }
-    - xserver
\ No newline at end of file
+    - xserver

playbooks/vagrant-shortstack-xml.yml

@@ -9,6 +9,10 @@
     - "group_vars/all"
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
     - edxlocal
     - { role: 'edxapp', EDXAPP_LMS_NGINX_PORT: 18030, EDXAPP_LMS_XML_NGINX_PORT: 80 }

playbooks/vagrant-shortstack.yml

@@ -9,7 +9,11 @@
     - "group_vars/all"
   roles:
     - common
-    - nginx
+    - role: nginx
+      nginx_sites:
+      - lms
+      - cms
+      - lms-preview
     - edxlocal
     - edxapp
     - oraclejdk