Merge pull request #1598 from edx/e0d/var-updates

E0d/var updates

playbooks/roles/analytics-api/defaults/main.yml

@@ -19,28 +19,7 @@ ANALYTICS_API_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }
 ANALYTICS_API_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
 ANALYTICS_API_NGINX_PORT: "18100"
 
-ANALYTICS_API_VERSION: "master"
-# Default dummy user, override this!!
-ANALYTICS_API_USERS:
-  "dummy-api-user": "changeme"
-
-ANALYTICS_API_CONFIG:
-  ANALYTICS_DATABASE: 'reports'
-  SECRET_KEY: 'Your secret key here'
-  TIME_ZONE: 'America/New_York'
-  LANGUAGE_CODE: 'en-us'
-  # email config
-  EMAIL_HOST: 'smtp.example.com'
-  EMAIL_HOST_PASSWORD: ""
-  EMAIL_HOST_USER: ""
-  EMAIL_PORT: 587
-  API_AUTH_TOKEN: 'put-your-api-token-here'
-  STATICFILES_DIRS: []
-  STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ analytics_api_service_name }}/staticfiles"
-  # db config
-  DATABASE_OPTIONS:
-    connect_timeout: 10
-  DATABASES:
+ANALYTICS_API_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
@@ -58,6 +37,38 @@ ANALYTICS_API_CONFIG:
     HOST: 'localhost'
     PORT: '3306'
 
+ANALYTICS_API_VERSION: "master"
+# Default dummy user, override this!!
+ANALYTICS_API_USERS:
+  "dummy-api-user": "changeme"
+
+ANALYTICS_API_SECRET_KEY: 'Your secret key here'
+ANALYTICS_API_TIME_ZONE: 'UTC'
+ANALTYCIS_API_LANGUAGE_CODE: 'en-us'
+ANALTYCIS_API_EMAIL_HOST: 'localhost'
+ANALYTICS_API_EMAIL_HOST_USER: 'mail_user'
+ANALTYCIS_API_EMAIL_HOST_PASSWORD: 'mail_password'
+ANALTYCIS_API_EMAIL_PORT: 587
+ANALTYCIS_API_AUTH_TOKEN: 'put-your-api-token-here'
+  
+ANALYTICS_API_CONFIG:
+  ANALYTICS_DATABASE: 'reports'
+  SECRET_KEY: '{{ ANALYTICS_API_SECRET_KEY }}'
+  TIME_ZONE: '{{ ANALYTICS_API_TIME_ZONE }}'
+  LANGUAGE_CODE: '{{ANALYTICS_API_LANGUAGE_CODE }}'
+  # email config
+  EMAIL_HOST: '{{ ANALYTICS_API_EMAIL_HOST }}'
+  EMAIL_HOST_PASSWORD: '{{ ANALYTICS_API_EMAIL_HOST_PASSWORD }}'
+  EMAIL_HOST_USER: '{{ ANALYTICS_API_EMAIL_HOST_USER }}'
+  EMAIL_PORT: '{{ ANALYTICS_API_EMAIL_PORT }}'
+  API_AUTH_TOKEN: '{{ ANALYTICS_API_AUTH_TOKEN }}'
+  STATICFILES_DIRS: ['static']
+  STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ analytics_api_service_name }}/staticfiles"
+  # db config
+  DATABASE_OPTIONS:
+    connect_timeout: 10
+  DATABASES: '{{ ANALYTICS_API_DATABASES }}'
+
 ANALYTICS_API_GUNICORN_WORKERS: "2"
 ANALYTICS_API_GUNICORN_EXTRA: ""
 #

playbooks/roles/insights/defaults/main.yml

@@ -16,16 +16,22 @@ INSIGHTS_FEEDBACK_EMAIL: 'dashboard@example.com'
 INSIGHTS_MKTG_BASE: 'http://example.com'
 INSIGHTS_PRIVACY_POLICY_URL: '{{ INSIGHTS_MKTG_BASE }}/privacy-policy'
 INSIGHTS_TERMS_OF_SERVICE_URL: '{{ INSIGHTS_MKTG_BASE }}/terms-service'
+INSIGHTS_SUPPORT_URL: ''
+INSIGHTS_OAUTH2_SECRET: 'secret'
+INSIGHTS_OATH2_KEY: 'key'
+INSIGHTS_OAUTH2_URL_ROOT: 'url_root'
+INSIGHTS_SECRET_KEY: 'YOUR_SECRET_KEY_HERE'
+INSIGHTS_OAUTH2_KEY: 'YOUR_OAUTH2_KEY'
 # This will not work on single instance sandboxes
 INSIGHTS_DOC_BASE: 'http://localhost/en/latest'
 INSIGHTS_LMS_BASE: 'http://localhost:18000'
-INSIGHTS_LMS_COURSE_VALIDATION_URL: '{{ INSIGHTS_LMS_BASE }}/courses'
-INSIGHTS_DOC_LOAD_ERROR_URL: '{{ INSIGHTS_DOC_BASE }}/Reference.html#error-conditions'
-
+ANALYTICS_API_ENDPOINT: 'http://localhost:18010'
+INSIGHTS_DATA_API_AUTH_TOKEN: 'YOUR_DATA_API_AUTH_TOKEN'
 INSIGHTS_PLATFORM_NAME: 'edX'
 INSIGHTS_APPLICATION_NAME: 'Insights'
 INSIGHTS_SEGMENT_IO_KEY: 'YOUR_KEY'
-INSIGHTS_TIME_ZONE: 'America/New_York'
+# should match the timezone of your map reduce pipeline
+INSIGHTS_TIME_ZONE: 'UTC'
 INSIGHTS_LANGUAGE_CODE: 'en-us'
 # email config
 INSIGHTS_EMAIL_HOST: 'smtp.example.com'
@@ -48,8 +54,8 @@ INSIGHTS_DATABASES:
 # This block of config is dropped into /edx/etc/insights.yml
 # and is read in by analytics_dashboard/settings/production.py
 INSIGHTS_CONFIG:
-  LMS_COURSE_VALIDATION_BASE_URL: '{{ INSIGHTS_LMS_COURSE_VALIDATION_URL }}'
-  DOCUMENTATION_LOAD_ERROR_URL: '{{ INSIGHTS_DOC_LOAD_ERROR_URL }}'
+  SUPPORT_URL: '{{ INSIGHTS_SUPPORT_URL }}'
+  DOCUMENTATION_LOAD_ERROR_URL: '{{ INSIGHTS_DOC_BASE }}/Reference.html#error-conditions'
   SEGMENT_IO_KEY: '{{ INSIGHTS_SEGMENT_IO_KEY }}'
   FEEDBACK_EMAIL: '{{ INSIGHTS_FEEDBACK_EMAIL }}'
   PRIVACY_POLICY_URL: '{{ INSIGHTS_PRIVACY_POLICY_URL }}'
@@ -59,9 +65,6 @@ INSIGHTS_CONFIG:
   DATA_API_URL: '{{ ANALYTICS_API_ENDPOINT }}'
   DATA_API_AUTH_TOKEN: '{{ INSIGHTS_DATA_API_AUTH_TOKEN }}'
   SOCIAL_AUTH_REDIRECT_IS_HTTPS: true  
-  SOCIAL_AUTH_EDX_OAUTH2_KEY: '{{ INSIGHTS_OAUTH2_KEY }}'
-  SOCIAL_AUTH_EDX_OAUTH2_SECRET: '{{ INSIGHTS_OAUTH2_SECRET }}'
-  SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT: '{{ INSIGHTS_OAUTH2_URL_ROOT }}'
   SOCIAL_AUTH_EDX_OIDC_KEY: '{{ INSIGHTS_OAUTH2_KEY }}'
   SOCIAL_AUTH_EDX_OIDC_SECRET: '{{ INSIGHTS_OAUTH2_SECRET }}'
   SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ INSIGHTS_OAUTH2_URL_ROOT }}'