Merge pull request #264 from edx/jbau/edx-west/config-stage-changes

edx-west staging playbook/config file update

playbooks/edx-west/stage-ansible.cfg

@@ -17,5 +17,5 @@ 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
-ssh_args=-F stage-ssh-config
+ssh_args=-F stage-ssh-config -o ControlMaster=auto -o ControlPersist=60s -o ControlPath=/tmp/ansible-ssh-%h-%p-%r
 scp_if_ssh=True

playbooks/edx-west/stage-app.yml

@@ -3,8 +3,8 @@
   sudo: True
   vars_prompt:
     - name: "migrate_db"
-      prompt: "Should this playbook run database migrations? (<Return> for false, anything else for true)"
-      default: false
+      prompt: "Should this playbook run database migrations? (Type 'yes' to run, anything else to skip migrations)"
+      default: "no"
       private: no
   vars:
     not_prod: true

playbooks/edx-west/stage-worker.yml

+# this gets all running stage util machiens
+- hosts: tag_environment_stage:&tag_function_util
+# or we can get subsets of them by name
+#- hosts: ~tag_Name_util(1|2)_stage
+  sudo: True
+  vars:
+    secure_dir: ../../../edx-secret/ansible
+    local_dir: ../../../edx-secret/ansible/local
+    migrate_db: "no"
+  vars_files:
+    - "{{ secure_dir }}/vars/edxapp_stage_vars.yml"
+    - "{{ secure_dir }}/vars/users.yml"
+    - "{{ secure_dir }}/vars/edxapp_stage_users.yml"
+  roles:
+    - common
+    - { role: 'edxapp', celery_worker: True }