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

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

playbooks/ansible.cfg

@@ -7,3 +7,16 @@
 jinja2_extensions=jinja2.ext.do
 hash_behaviour=merge
 host_key_checking = False
+
+# These are environment-specific defaults
+forks=10
+transport=ssh
+hostfile=./ec2.py
+extra_vars='key=deployment region=us-west-1'
+user=ubuntu
+
+
+[ssh_connection]
+# example from https://github.com/ansible/ansible/blob/devel/examples/ansible.cfg
+ssh_args= -o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
+scp_if_ssh=True

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

 #- hosts: ~tag_Name_app(10|20)_carn
-- hosts: ~tag_Name_app10_carn
+#- hosts: ~tag_Name_app10_carn
 #- hosts: ~tag_Name_app20_carn
+- hosts: ~tag_Name_app1_carn
   sudo: True
   vars_prompt:
     - name: "migrate_db"
@@ -23,13 +24,13 @@
   roles:
     - common
     - supervisor
-#    - php
+    - php
     - role: nginx
       nginx_sites:
       - lms
       - cms
       - lms-preview
-#      - phpmyadmin
+      - phpmyadmin
       nginx_template_directory: "{{local_dir}}/nginx/templates/carnegie/"
       nginx_conf: true
     - {'role': 'edxapp', 'openid_workaround': true, 'template_subdir': 'carnegie'}

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

@@ -14,8 +14,9 @@
 #- 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_app10_cme
+#- hosts: ~tag_Name_app10_cme
 #- hosts: ~tag_Name_app20_cme
+- hosts: ~tag_Name_app(1|2)_cme
   sudo: True
   vars_prompt:
     - name: "migrate_db"

playbooks/edx-west/prod-app.yml

@@ -5,7 +5,8 @@
 #- hosts: ~tag_Name_app(10|20)_prod
 #- hosts: ~tag_Name_app(11|21)_prod
 ## this is the test box
-- hosts: ~tag_Name_app4_prod
+#- hosts: ~tag_Name_app4_prod
+- hosts: ~tag_Name_app(4_new|1|2)_prod
 ## you can also do security group, but don't do that
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True
@@ -41,4 +42,4 @@
     - datadog
     #- splunkforwarder
     # run this role last
-    - in_production
+    #- in_production

playbooks/roles/php/tasks/phpmyadmin.yml

@@ -75,6 +75,7 @@
   - phpmyadmin
 
 - name: grant all on phpmyadin database to control user
+  ignore_errors: true
   mysql_user: >
     login_host={{ MYSQL_SERVER_HOST }}
     login_user={{ MYSQL_SERVER_USER }} login_password={{ MYSQL_SERVER_PASS }}