Merge branch 'edx-west/release' of github.com:edx/configuration into edx-west/release

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

-- hosts: ~tag_Name_app(10|20)_carn
-#- hosts: ~tag_Name_app20_carn
+#- hosts: ~tag_Name_app(10|20)_carn
+- hosts: ~tag_Name_app10_carn
   sudo: True
   vars_prompt:
     - name: "migrate_db"
@@ -21,13 +21,13 @@
     - "{{ secure_dir }}/vars/datadog_carn.yml"
   roles:
     - common
-    - php
+#    - php
     - role: nginx
       nginx_sites:
       - lms
       - cms
       - lms-preview
-      - phpmyadmin
+#      - phpmyadmin
       nginx_template_directory: "{{local_dir}}/nginx/templates/carnegie/"
     - {'role': 'edxapp', 'openid_workaround': true}
     - datadog

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

@@ -13,8 +13,8 @@
 # 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)_cme
-#- hosts: ~tag_Name_app20_cme
+#- hosts: ~tag_Name_app(10|20)_cme
+- hosts: ~tag_Name_app10_cme
   sudo: True
   vars_prompt:
     - name: "migrate_db"

playbooks/edx-west/stage-app.yml

-- hosts: tag_environment_stage:&tag_function_webserver
+#- hosts: tag_environment_stage:&tag_function_webserver
+- hosts: ~tag_Name_app10_stage
   sudo: True
   vars_prompt:
     - name: "migrate_db"

playbooks/edx-west/stage-worker.yml

-  # this gets all running stage util machiens
+  # this gets all running stage util machines
 - hosts: tag_environment_stage:&tag_function_util
 # or we can get subsets of them by name
 #- hosts: ~tag_Name_util(1|2)_stage