Merge pull request #3048 from edx/bderusha/ecom-affiliate

Add affiliate cookie name to ecommerce config

AUTHORS

@@ -53,3 +53,4 @@ Omar Al-Ithawi <oithawi@qrf.org>
 David Adams<dcadams@stanford.edu>
 Florian Haas <florian@hastexo.com>
 Shohei Maeda <s.maeda@gacco.co.jp>
+Bill DeRusha <bill@edx.org>

playbooks/roles/ecommerce/defaults/main.yml

@@ -65,6 +65,9 @@ ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
 # Analytics related
 ECOMMERCE_SEGMENT_KEY: !!null
 
+# Settings for affiliate cookie tracking
+ECOMMERCE_AFFILIATE_COOKIE_NAME: '{{ EDXAPP_AFFILIATE_COOKIE_NAME | default("dev_affiliate_id") }}'
+
 # CyberSource related
 ECOMMERCE_CYBERSOURCE_PROFILE_ID: 'SET-ME-PLEASE'
 ECOMMERCE_CYBERSOURCE_MERCHANT_ID: 'SET-ME-PLEASE'
@@ -156,6 +159,7 @@ ECOMMERCE_SERVICE_CONFIG:
   SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ ECOMMERCE_LMS_URL_ROOT }}/oauth2'
   SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ ECOMMERCE_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}'
   SEGMENT_KEY: '{{ ECOMMERCE_SEGMENT_KEY }}'
+  AFFILIATE_COOKIE_KEY: '{{ ECOMMERCE_AFFILIATE_COOKIE_NAME }}'
 
   STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ ecommerce_service_name }}/staticfiles"
   # db config

playbooks/roles/edxapp/defaults/main.yml

@@ -155,7 +155,7 @@ EDXAPP_API_DOCUMENTATION_URL: "http://edx.readthedocs.org/projects/edx-platform-
 EDXAPP_AUTH_DOCUMENTATION_URL: "http://edx.readthedocs.org/projects/edx-platform-api/en/latest/authentication.html"
 
 # Settings for affiliate cookie tracking
-EDXAPP_AFFILIATE_COOKIE_NAME: 'affiliate_id'
+EDXAPP_AFFILIATE_COOKIE_NAME: 'dev_affiliate_id'
 
 EDXAPP_ENABLE_EDXNOTES: false