Merge pull request #3986 from edx/jibsheet/modernize-analytics-api-defaults

Remove old variables, add our more modern style of overrides

CHANGELOG.md

@@ -333,7 +333,11 @@
 - Role: insights
   - Removed `bower install` task
   - Replaced r.js build task with webpack build task
-  - Removed `./maange.py compress` task
+  - Removed `./manage.py compress` task
 
 - Role: insights
   - Moved `THEME_SCSS` from `INSIGHTS_CONFIG` to `insights_environment`
+
+- Role: analytics_api
+  - Added a number of `ANALYTICS_API_DEFAULT_*` and `ANALYTICS_API_REPORTS_*` variables to allow more selective specification of database parameters (rather than
+      overriding the whole structure).

playbooks/roles/analytics_api/defaults/main.yml

@@ -20,9 +20,18 @@ ANALYTICS_API_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
 ANALYTICS_API_NGINX_PORT: "18100"
 
 ANALYTICS_API_DEFAULT_DB_NAME: 'analytics-api'
+ANALYTICS_API_DEFAULT_USER: 'api001'
+ANALYTICS_API_DEFAULT_PASSWORD: 'password'
+ANALYTICS_API_DEFAULT_HOST: 'localhost'
+ANALYTICS_API_DEFAULT_PORT: '3306'
 ANALYTICS_API_DEFAULT_MYSQL_OPTIONS:
   connect_timeout: 10
+
 ANALYTICS_API_REPORTS_DB_NAME: 'reports'
+ANALYTICS_API_REPORTS_USER: 'reports001'
+ANALYTICS_API_REPORTS_PASSWORD: 'password'
+ANALYTICS_API_REPORTS_HOST: 'localhost'
+ANALYTICS_API_REPORTS_PORT: '3306'
 ANALYTICS_API_REPORTS_MYSQL_OPTIONS:
   connect_timeout: 10
 
@@ -31,19 +40,19 @@ ANALYTICS_API_DATABASES:
   default:
     ENGINE: 'django.db.backends.mysql'
     NAME: '{{ ANALYTICS_API_DEFAULT_DB_NAME }}'
-    USER: 'api001'
-    PASSWORD: 'password'
-    HOST: 'localhost'
-    PORT: '3306'
+    USER: '{{ ANALYTICS_API_DEFAULT_USER }}'
+    PASSWORD: '{{ ANALYTICS_API_DEFAULT_PASSWORD }}'
+    HOST: '{{ ANALYTICS_API_DEFAULT_HOST }}'
+    PORT: '{{ ANALYTICS_API_DEFAULT_PORT }}'
     OPTIONS: "{{ ANALYTICS_API_DEFAULT_MYSQL_OPTIONS }}"
   # read-only user
   reports:
     ENGINE: 'django.db.backends.mysql'
     NAME: '{{ ANALYTICS_API_REPORTS_DB_NAME }}'
-    USER: 'reports001'
-    PASSWORD: 'password'
-    HOST: 'localhost'
-    PORT: '3306'
+    USER: '{{ ANALYTICS_API_REPORTS_USER }}'
+    PASSWORD: '{{ ANALYTICS_API_REPORTS_PASSWORD }}'
+    HOST: '{{ ANALYTICS_API_REPORTS_HOST }}'
+    PORT: '{{ ANALYTICS_API_REPORTS_PORT }}'
     OPTIONS: "{{ ANALYTICS_API_REPORTS_MYSQL_OPTIONS }}"
 
 ANALYTICS_API_VERSION: "master"
@@ -54,10 +63,6 @@ ANALYTICS_API_USERS:
 ANALYTICS_API_SECRET_KEY: 'Your secret key here'
 ANALYTICS_API_TIME_ZONE: 'UTC'
 ANALYTICS_API_LANGUAGE_CODE: 'en-us'
-ANALYTICS_API_EMAIL_HOST: 'localhost'
-ANALYTICS_API_EMAIL_HOST_USER: 'mail_user'
-ANALYTICS_API_EMAIL_HOST_PASSWORD: 'mail_password'
-ANALYTICS_API_EMAIL_PORT: 587
 ANALYTICS_API_AUTH_TOKEN: 'put-your-api-token-here'
 
 
@@ -107,11 +112,6 @@ ANALYTICS_API_SERVICE_CONFIG:
   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"

playbooks/sample_vars/passwords.yml

@@ -4,7 +4,6 @@
 # The current process is described here: https://openedx.atlassian.net/wiki/x/dQArCQ
 #
 
-ANALYTICS_API_EMAIL_HOST_PASSWORD: !!null
 ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD: !!null
 ANALYTICS_SCHEDULE_MASTER_SSH_CREDENTIAL_PASSPHRASE: !!null
 COMMON_HTPASSWD_PASS: !!null