Merge pull request #1292 from edx/jarv/edge-var-updates

In the configuration hash values set to "None" will be converted to None

playbooks/roles/edxapp/defaults/main.yml

@@ -11,12 +11,16 @@
 #
 # Defaults specified here should not contain
 # any secrets or host identifying information.
+#
+# Variables set to "None" will be converted to None
+# when the edxapp config is written to disk.
+
 
-EDXAPP_LMS_BASE: ''
-EDXAPP_PREVIEW_LMS_BASE: ''
-EDXAPP_CMS_BASE: ''
-EDXAPP_AWS_ACCESS_KEY_ID:  ''
-EDXAPP_AWS_SECRET_ACCESS_KEY:  ''
+EDXAPP_LMS_BASE: ""
+EDXAPP_PREVIEW_LMS_BASE: ""
+EDXAPP_CMS_BASE: ""
+EDXAPP_AWS_ACCESS_KEY_ID:  ""
+EDXAPP_AWS_SECRET_ACCESS_KEY:  ""
 EDXAPP_XQUEUE_BASIC_AUTH: [ "{{ COMMON_HTPASSWD_USER }}", "{{ COMMON_HTPASSWD_PASS }}" ]
 EDXAPP_XQUEUE_DJANGO_AUTH:
   username: 'lms'
@@ -52,17 +56,17 @@ EDXAPP_MEMCACHE: [ 'localhost:11211' ]
 EDXAPP_COMMENTS_SERVICE_URL:  'http://localhost:18080'
 EDXAPP_COMMENTS_SERVICE_KEY:  'password'
 
-EDXAPP_EDXAPP_SECRET_KEY: ''
+EDXAPP_EDXAPP_SECRET_KEY: ""
 
 EDXAPP_OEE_URL: 'http://localhost:18060/'
 EDXAPP_OEE_USER: 'lms'
 EDXAPP_OEE_PASSWORD: 'password'
 
-EDXAPP_ANALYTICS_API_KEY:  ''
+EDXAPP_ANALYTICS_API_KEY:  ""
 EDXAPP_PAYMENT_SUPPORT_EMAIL: "billing@example.com"
-EDXAPP_ZENDESK_USER: ''
-EDXAPP_ZENDESK_URL: ''
-EDXAPP_ZENDESK_API_KEY: ''
+EDXAPP_ZENDESK_USER: ""
+EDXAPP_ZENDESK_URL: ""
+EDXAPP_ZENDESK_API_KEY: ""
 EDXAPP_CELERY_USER: 'celery'
 EDXAPP_CELERY_PASSWORD: 'celery'
 
@@ -71,10 +75,10 @@ EDXAPP_VIDEO_CDN_URLS:
 
 EDXAPP_PLATFORM_NAME: 'Your Platform Name Here'
 
-EDXAPP_CAS_SERVER_URL: ''
-EDXAPP_CAS_EXTRA_LOGIN_PARAMS: ''
-EDXAPP_CAS_ATTRIBUTE_CALLBACK: ''
-EDXAPP_CAS_ATTRIBUTE_PACKAGE: ''
+EDXAPP_CAS_SERVER_URL: ""
+EDXAPP_CAS_EXTRA_LOGIN_PARAMS: ""
+EDXAPP_CAS_ATTRIBUTE_CALLBACK: ""
+EDXAPP_CAS_ATTRIBUTE_PACKAGE: ""
 # Enable an end-point that creates a user and logs them in
 # Used for performance testing
 EDXAPP_ENABLE_AUTO_AUTH: false
@@ -95,20 +99,20 @@ EDXAPP_FEATURES:
   AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH
   ENABLE_THIRD_PARTY_AUTH: $EDXAPP_ENABLE_THIRD_PARTY_AUTH
 
-EDXAPP_BOOK_URL: ''
+EDXAPP_BOOK_URL: ""
 # This needs to be set to localhost
 # if xqueue is run on the same server
 # as the lms (it's sent in the request)
 EDXAPP_SITE_NAME: 'localhost'
 EDXAPP_LMS_SITE_NAME: "{{ EDXAPP_SITE_NAME }}"
 EDXAPP_CMS_SITE_NAME: 'localhost'
-EDXAPP_MEDIA_URL:  ''
-EDXAPP_ANALYTICS_SERVER_URL:  ''
-EDXAPP_FEEDBACK_SUBMISSION_EMAIL: ''
-EDXAPP_CELERY_BROKER_HOSTNAME: ''
+EDXAPP_MEDIA_URL:  ""
+EDXAPP_ANALYTICS_SERVER_URL:  ""
+EDXAPP_FEEDBACK_SUBMISSION_EMAIL: ""
+EDXAPP_CELERY_BROKER_HOSTNAME: ""
 EDXAPP_LOGGING_ENV:  'sandbox'
 
-EDXAPP_SYSLOG_SERVER: ''
+EDXAPP_SYSLOG_SERVER: ""
 EDXAPP_RABBIT_HOSTNAME: 'localhost'
 EDXAPP_XML_MAPPINGS: {}
 
@@ -152,11 +156,11 @@ EDXAPP_GRADE_ROOT_PATH: '/tmp/edx-s3/grades'
 # These are the same defaults set in common.py
 EDXAPP_CC_PROCESSOR:
   CyberSource:
-    SHARED_SECRET: ''
-    MERCHANT_ID: ''
-    SERIAL_NUMBER: ''
+    SHARED_SECRET: ""
+    MERCHANT_ID: ""
+    SERIAL_NUMBER: ""
     ORDERPAGE_VERSION: '7'
-    PURCHASE_ENDPOINT: ''
+    PURCHASE_ENDPOINT: ""
 
 # does not affect verified students
 EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY: ['usd', '$']
@@ -201,7 +205,7 @@ EDXAPP_UPDATE_STATIC_FILES_KEY: false
 
 EDXAPP_INSTALL_PRIVATE_REQUIREMENTS: false
 
-EDXAPP_GOOGLE_ANALYTICS_ACCOUNT: "UA-DUMMY"
+EDXAPP_GOOGLE_ANALYTICS_ACCOUNT: "None"
 
 EDXAPP_PEARSON_TEST_PASSWORD: ""
 EDXAPP_SEGMENT_IO_LMS: false
@@ -220,7 +224,7 @@ EDXAPP_BULK_EMAIL_EMAILS_PER_TASK: 500
 # If using microsites this should point to the microsite repo
 EDXAPP_MICROSITE_ROOT_DIR: "{{ edxapp_app_dir }}/edx-microsite"
 # this dictionary defines what microsites are configured
-EDXAPP_MICROSITE_CONFIGRATION: {}
+EDXAPP_MICROSITE_CONFIGURATION: {}
 # Instructor code that will not be run in the code sandbox
 EDXAPP_COURSES_WITH_UNSAFE_CODE: []
 EDXAPP_SESSION_COOKIE_DOMAIN: ""
@@ -424,7 +428,7 @@ generic_env_config:  &edxapp_generic_env
   COURSES_WITH_UNSAFE_CODE: $EDXAPP_COURSES_WITH_UNSAFE_CODE
   BULK_EMAIL_EMAILS_PER_TASK: $EDXAPP_BULK_EMAIL_EMAILS_PER_TASK
   MICROSITE_ROOT_DIR: $EDXAPP_MICROSITE_ROOT_DIR
-  MICROSITE_CONFIGURATION: $EDXAPP_MICROSITE_CONFIGRATION
+  MICROSITE_CONFIGURATION: $EDXAPP_MICROSITE_CONFIGURATION
   GRADES_DOWNLOAD:
     STORAGE_TYPE: $EDXAPP_GRADE_STORAGE_TYPE
     BUCKET: $EDXAPP_GRADE_BUCKET

playbooks/roles/edxapp/templates/cms.auth.json.j2

 {% do cms_auth_config.update(EDXAPP_AUTH_EXTRA) %}
+{% for key, value in cms_auth_config.iteritems() %}
+  {% if value == 'None' %}
+    {% do cms_auth_config.update({key: None }) %} 
+  {% endif %}
+{% endfor %}
+
 {{ cms_auth_config | to_nice_json }}

playbooks/roles/edxapp/templates/cms.env.json.j2

 {% do cms_env_config.update(EDXAPP_ENV_EXTRA) %}
-{% if EDXAPP_UPDATE_STATIC_FILES_KEY %}
-  {%- do cms_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %}
-{% endif %}
+{% for key, value in cms_env_config.iteritems() %}
+  {% if value == 'None' %}
+    {% do cms_env_config.update({key: None }) %}
+  {% endif %}
+{% endfor %}
 {{ cms_env_config | to_nice_json }}

playbooks/roles/edxapp/templates/lms.auth.json.j2

 {% do lms_auth_config.update(EDXAPP_AUTH_EXTRA) %}
+{% for key, value in lms_auth_config.iteritems() %}
+  {% if value == 'None' %}
+    {% do lms_auth_config.update({key: None }) %} 
+  {% endif %}
+{% endfor %}
 {{ lms_auth_config | to_nice_json }}

playbooks/roles/edxapp/templates/lms.env.json.j2

 {% do lms_env_config.update(EDXAPP_ENV_EXTRA) %}
-{% if EDXAPP_UPDATE_STATIC_FILES_KEY %}
-  {%- do lms_env_config['CACHES']['staticfiles'].update({'KEY_PREFIX': edxapp_dynamic_cache_key}) %}
-{% endif %}
+{% for key, value in lms_env_config.iteritems() %}
+  {% if value == 'None' %}
+    {% do lms_env_config.update({key: None }) %} 
+  {% endif %}
+{% endfor %}
 {{ lms_env_config | to_nice_json }}

util/vpc-tools/abbey.py

@@ -290,10 +290,6 @@ cat << EOF >> $extra_vars
 # up healthy
 fake_migrations: true
 
-# Use the build number an the dynamic cache key.
-EDXAPP_UPDATE_STATIC_FILES_KEY: true
-edxapp_dynamic_cache_key: {deployment}-{environment}-{play}-{cache_id}
-
 disable_edx_services: true
 COMMON_TAG_EC2_INSTANCE: true