Merge pull request #803 from edx/jarv/change-secure-vars

removing vars_files

playbooks/edx-east/aws.yml

@@ -2,7 +2,5 @@
   hosts: all
   sudo: True
   gather_facts: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws

playbooks/edx-east/certs.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - certs

playbooks/edx-east/common.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - common
     - role: datadog

playbooks/edx-east/demo.yml

@@ -5,10 +5,8 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
-    - demo 
+    - demo
     - role: datadog
       when: enable_datadog
     - role: splunkforwarder

playbooks/edx-east/devpi.yml

@@ -2,7 +2,5 @@
   hosts: all
   sudo: True
   gather_facts: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - devpi

playbooks/edx-east/discern.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - role: nginx

playbooks/edx-east/dummy.yml

----
-# dummy var file
-# This file is needed as a fall through
-# for vars_files
-dummy_var: True

playbooks/edx-east/edxapp.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - role: nginx

playbooks/edx-east/forum.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - role: nginx

playbooks/edx-east/ora.yml

@@ -2,8 +2,6 @@
   hosts: all
   sudo: True
   gather_facts: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - role: nginx
       nginx_sites:

playbooks/edx-east/rabbitmq.yml

@@ -2,8 +2,6 @@
   hosts: all
   sudo: True
   gather_facts: False
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - rabbitmq

playbooks/edx-east/worker.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - role: edxapp

playbooks/edx-east/xqueue.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - role: nginx

playbooks/edx-east/xserver.yml

@@ -5,8 +5,6 @@
   vars:
     enable_datadog: True
     enable_splunkforwarder: True
-  vars_files:
-    - ["{{ secure_vars }}", "dummy.yml"]
   roles:
     - aws
     - role: nginx

util/vpc-tools/abbey.py

@@ -324,10 +324,6 @@ cat << EOF >> $extra_vars
 
 {git_refs_yml}
 
-# path to local checkout of
-# the secure repo
-secure_vars: $secure_vars_file
-
 # The private key used for pulling down
 # private edx-platform repos is the same
 # identity of the github huser that has
@@ -362,8 +358,8 @@ sudo pip install -r requirements.txt
 
 cd $playbook_dir
 
-ansible-playbook -vvvv -c local -i "localhost," $play.yml -e@$extra_vars
-ansible-playbook -vvvv -c local -i "localhost," stop_all_edx_services.yml -e@$extra_vars
+ansible-playbook -vvvv -c local -i "localhost," $play.yml -e@$secure_vars_file -e@$extra_vars
+ansible-playbook -vvvv -c local -i "localhost," stop_all_edx_services.yml -e@$secure_vars_file -e@$extra_vars
 
 rm -rf $base_dir