Merge pull request #2312 from edx/bderusha/segment-cleanup

Update config variable names for Segment

CHANGELOG.md

+- Role: edxapp
+  - All of the following changes are BACKWARDS-INCOMPATABLE:
+    - Renamed two top level variables SEGMENT_IO_LMS_KEY and SEGMENT_IO_KEY to SEGMENT_KEY in {lms|cms].auth.json.
+    - Renamed two top level variables in roles/edxapp/defaults/main.yml.  EDXAPP_SEGMENT_IO_LMS_KEY and EDXAPP_SEGMENT_IO_KEY are now EDXAPP_LMS_SEGMENT_KEY and EDXAPP_CMS_SEGMENT_KEY respectively
+    - REMOVED two top level variables SEGMENT_IO_LMS and SEGMENT_IO from {lms|cms].auth.json. We will use the existence of the SEGMENT_KEY to to serve the same function that these boolean variables served.
+    - REMOVED two top level variables EDXAPP_SEGMENT_IO_LMS and EDXAPP_SEGMENT_IO from roles/edxapp/defaults/main.yml.
+
 - Updated ansible fork to be based on ansible 1.9.3rc1 instead of 1.9.1
   - Ansible Changelog: https://github.com/ansible/ansible/blob/stable-1.9/CHANGELOG.md
 

playbooks/roles/edxapp/defaults/main.yml

@@ -349,13 +349,10 @@ EDXAPP_EXTRA_REQUIREMENTS: []
 
 EDXAPP_GOOGLE_ANALYTICS_ACCOUNT: "None"
 
-EDXAPP_SEGMENT_IO_LMS: false
-EDXAPP_SEGMENT_IO_LMS_KEY: ""
 EDXAPP_OPTIMIZELY_PROJECT_ID: "None"
 EDXAPP_TRACKING_SEGMENTIO_WEBHOOK_SECRET: ""
-# For the CMS
-EDXAPP_SEGMENT_IO_KEY: ""
-EDXAPP_SEGMENT_IO: false
+EDXAPP_CMS_SEGMENT_KEY: "None"
+EDXAPP_LMS_SEGMENT_KEY: "None"
 EDXAPP_EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST: []
 
 EDXAPP_EDX_API_KEY: "PUT_YOUR_API_KEY_HERE"
@@ -813,8 +810,6 @@ generic_env_config:  &edxapp_generic_env
   SESSION_COOKIE_DOMAIN:  "{{ EDXAPP_SESSION_COOKIE_DOMAIN }}"
   SESSION_COOKIE_NAME:  "{{ EDXAPP_SESSION_COOKIE_NAME }}"
   COMMENTS_SERVICE_KEY: "{{ EDXAPP_COMMENTS_SERVICE_KEY }}"
-  SEGMENT_IO_LMS: "{{ EDXAPP_SEGMENT_IO_LMS }}"
-  SEGMENT_IO: "{{ EDXAPP_SEGMENT_IO }}"
   THEME_NAME: "{{ edxapp_theme_name }}"
   TECH_SUPPORT_EMAIL: "{{ EDXAPP_TECH_SUPPORT_EMAIL }}"
   CONTACT_EMAIL: "{{ EDXAPP_CONTACT_EMAIL }}"
@@ -846,7 +841,7 @@ generic_env_config:  &edxapp_generic_env
 
 lms_auth_config:
   <<: *edxapp_generic_auth
-  SEGMENT_IO_LMS_KEY: "{{ EDXAPP_SEGMENT_IO_LMS_KEY }}"
+  SEGMENT_KEY: "{{ EDXAPP_LMS_SEGMENT_KEY }}"
   OPTIMIZELY_PROJECT_ID: "{{ EDXAPP_OPTIMIZELY_PROJECT_ID }}"
   EDX_API_KEY: "{{ EDXAPP_EDX_API_KEY }}"
   VERIFY_STUDENT: "{{ EDXAPP_VERIFY_STUDENT }}"
@@ -916,7 +911,7 @@ lms_env_config:
 
 cms_auth_config:
   <<: *edxapp_generic_auth
-  SEGMENT_IO_KEY: "{{ EDXAPP_SEGMENT_IO_KEY }}"
+  SEGMENT_KEY: "{{ EDXAPP_CMS_SEGMENT_KEY }}"
   MODULESTORE:
     default:
         ENGINE: 'xmodule.modulestore.mixed.MixedModuleStore'