Merge pull request #246 from edx/jbau/cme-and-carnegie

Jbau/cme and carnegie

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

+
+# set up the fireball transport
+#- hosts: ~tag_Name_app(10|20)_cme
+#  gather_facts: no
+#  connection: ssh # or paramiko
+#  sudo: yes
+#  tasks:
+#      - apt: pkg=gcc state=present
+#      - apt: pkg=libzmq-dev,python-zmq state=present
+#      - action: fireball
+
+
+# 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)_carn
+  sudo: True
+  vars_prompt:
+    - name: "migrate_db"
+      prompt: "Should this playbook run database migrations? (Type 'yes' to run, anything else to skip migrations)"
+      default: "no"
+      private: no
+  vars:
+    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'
+    not_prod: true
+  vars_files:
+    - "{{ secure_dir }}/vars/edxapp_carnegie_vars.yml"
+    - "{{ secure_dir }}/vars/users.yml"
+    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+  roles:
+    - common
+    - nginx
+    - {'role': 'edxapp', 'openid_workaround': true}
+    # run this role last
+    # - in_production

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

+# this gets all running prod webservers
+- hosts: tag_environment_prod_carn:&tag_function_util
+# or we can get subsets of them by name
+#- hosts: ~tag_Name_util(10)_carn
+  sudo: True
+  vars:
+    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'
+    migrate_db: "no"
+  vars_files:
+    - "{{ secure_dir }}/vars/edxapp_carnegie_vars.yml"
+    - "{{ secure_dir }}/vars/users.yml"
+    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+  roles:
+    - common
+    - { role: 'edxapp', celery_worker: True }

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

+
+# set up the fireball transport
+#- hosts: ~tag_Name_app(10|20)_cme
+#  gather_facts: no
+#  connection: ssh # or paramiko
+#  sudo: yes
+#  tasks:
+#      - apt: pkg=gcc state=present
+#      - apt: pkg=libzmq-dev,python-zmq state=present
+#      - action: fireball
+
+
 # this gets all running prod webservers
 #- hosts: tag_environment_prod:&tag_function_webserver
 # or we can get subsets of them by name
@@ -9,10 +21,11 @@
       default: "no"
       private: no
   vars:
-    secure_dir: '../../../configuration-secure/ansible'
+    secure_dir: '../../../edx-secret/ansible'
     # this indicates the path to site-specific (with precedence)
     # things like nginx template files
-    local_dir:  '../../../configuration-secure/ansible/local'
+    local_dir:  '../../../../../../edx-secret/ansible/local'
+    not_prod: true
   vars_files:
     - "{{ secure_dir }}/vars/edxapp_cme_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
@@ -20,6 +33,6 @@
   roles:
     - common
     - nginx
-    - edxapp
+    - {'role': 'edxapp', 'openid_workaround': true}
     # run this role last
-    - in_production
+    # - in_production

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

+# this gets all running prod webservers
+- hosts: tag_environment_prod_cme:&tag_function_util
+# or we can get subsets of them by name
+#- hosts: ~tag_Name_util(10)_cme
+  sudo: True
+  vars:
+    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'
+    migrate_db: "no"
+  vars_files:
+    - "{{ secure_dir }}/vars/edxapp_cme_vars.yml"
+    - "{{ secure_dir }}/vars/users.yml"
+    - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
+  roles:
+    - common
+    - { role: 'edxapp', celery_worker: True }