Merge pull request #807 from edx/jarv/remove-dump-vars

turn off dump vars by default

playbooks/roles/aws/defaults/main.yml

@@ -36,6 +36,13 @@ AWS_S3_LOG_PATHS:
   - bucket: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-tracking-logs"
     path: "{{ COMMON_LOG_DIR }}/"
     extra_args: "--exclude '*' --include '*tracking*'"
+
+# set this to true dump all extra vars
+# this is currently broken when extra vars
+# contains references to vars that are not
+# included in the play.
+AWS_DUMP_VARS: false
+
 #
 # vars are namespace with the module name.
 #

playbooks/roles/aws/tasks/main.yml

@@ -63,12 +63,14 @@
 
 - name: dump all vars to yaml
   template: src=dumpall.yml.j2 dest={{ aws_var_file }} mode=0600
+  when: AWS_DUMP_VARS
 
 - name: create symlink for config file
   file: >
     src={{ aws_var_file }}
     dest={{ COMMON_CFG_DIR }}/{{ aws_var_file|basename }}
     state=link
+  when: AWS_DUMP_VARS
 
 - name: clean up var file, removing all version vars and internal ansible vars
   shell: sed -i -e "/{{item}}/d" {{ aws_var_file }}
@@ -96,6 +98,7 @@
     - "^delegate_to:"
     - "^ansible_ssh_private_key_file:"
     - "^always_run:"
+  when: AWS_DUMP_VARS
 
 
 - name: create s3 log sync script

util/jenkins/ansible-provision.sh

@@ -141,6 +141,7 @@ EDXAPP_GRADE_ROOT_PATH: 'sandbox'
 AWS_S3_LOGS: true
 AWS_S3_LOGS_NOTIFY_EMAIL: devops+sandbox-log-sync@edx.org
 AWS_S3_LOGS_FROM_EMAIL: devops@edx.org
+AWS_DUMP_VARS: true
 EOF
 
 if [[ $basic_auth == "true" ]]; then