Merge pull request #3541 from edx/bbeggs/analytics_db_update

Database parameter overrides for analytics.

playbooks/roles/analytics_pipeline/defaults/main.yml

@@ -11,12 +11,17 @@
 # Defaults for role analytics_pipeline
 #
 
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER: pipeline001
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD: password
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_HOST: localhost
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_PORT: 3306
+
 ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME: "{{ ANALYTICS_API_REPORTS_DB_NAME }}"
 ANALYTICS_PIPELINE_OUTPUT_DATABASE:
-  username: pipeline001
-  password: password
-  host: localhost
-  port: 3306
+  username: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER }}"
+  password: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD }}"
+  host: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_HOST }}"
+  port: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PORT }}"
 
 ANALYTICS_PIPELINE_INPUT_DATABASE:
   username: "{{ COMMON_MYSQL_READ_ONLY_USER }}"

playbooks/roles/edxlocal/defaults/main.yml

@@ -24,8 +24,8 @@ edxlocal_database_users:
     }
   - {
       db: "{{ INSIGHTS_DATABASE_NAME | default(None) }}",
-      user: "{{ INSIGHTS_DATABASES.default.USER | default(None) }}",
-      pass: "{{ INSIGHTS_DATABASES.default.PASSWORD | default(None) }}"
+      user: "{{ INSIGHTS_MYSQL_USER | default(None) }}",
+      pass: "{{ INSIGHTS_MYSQL_USER | default(None) }}"
     }
   - {
       db: "{{ XQUEUE_MYSQL_DB_NAME | default(None) }}",
@@ -49,13 +49,13 @@ edxlocal_database_users:
     }
   - {
       db: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME | default(None) }}",
-      user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE.username }}",
-      pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE.password }}"
+      user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER | default(None) }}",
+      pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ HIVE_METASTORE_DATABASE_NAME | default(None) }}",
-      user: "{{ HIVE_METASTORE_DATABASE.user | default(None) }}",
-      pass: "{{ HIVE_METASTORE_DATABASE.password | default(None) }}"
+      user: "{{ HIVE_METASTORE_DATABASE_USER | default(None) }}",
+      pass: "{{ HIVE_METASTORE_DATABASE_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ CREDENTIALS_DEFAULT_DB_NAME | default(None) }}",

playbooks/roles/hive/defaults/main.yml

@@ -18,12 +18,17 @@ HIVE_CONF: "{{ HIVE_HOME }}/conf"
 HIVE_LIB: "{{ HIVE_HOME }}/lib"
 
 HIVE_METASTORE_DATABASE_NAME: edx_hive_metastore
+HIVE_METASTORE_DATABASE_USER: edx_hive
+HIVE_METASTORE_DATABASE_PASSWORD: edx
+HIVE_METASTORE_DATABASE_HOST: 127.0.0.1
+HIVE_METASTORE_DATABASE_PORT: 3306
+
 HIVE_METASTORE_DATABASE:
-  user: edx_hive
-  password: edx
+  user: "{{ HIVE_METASTORE_DATABASE_USER }}"
+  password: "{{ HIVE_METASTORE_DATABASE_PASSWORD }}"
   name: "{{ HIVE_METASTORE_DATABASE_NAME }}"
-  host: 127.0.0.1
-  port: 3306
+  host: "{{ HIVE_METASTORE_DATABASE_HOST }}"
+  port: "{{ HIVE_METASTORE_DATABASE_PORT }}"
 
 
 #

playbooks/roles/insights/defaults/main.yml

@@ -61,15 +61,20 @@ INSIGHTS_LEARNER_API_LIST_DOWNLOAD_FIELDS: !!null
 
 INSIGHTS_DATABASE_NAME: 'dashboard'
 
+INSIGHTS_DATABASE_USER: rosencrantz
+INSIGHTS_DATABASE_PASSWORD: secret
+INSIGHTS_DATABASE_HOST: "db.{{ DOCKER_TLD  }}"
+INSIGHTS_DATABASE_PORT: 3306
+
 INSIGHTS_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
     NAME: '{{ INSIGHTS_DATABASE_NAME }}'
-    USER: 'rosencrantz'
-    PASSWORD: 'secret'
-    HOST: '127.0.0.1'
-    PORT: '3306'
+    USER: '{{ INSIGHTS_DATABASE_USER }}'
+    PASSWORD: '{{ INSIGHTS_DATABASE_PASSWORD }}'
+    HOST: "{{ INSIGHTS_DATABASE_HOST }}"
+    PORT: '{{ INSIGHTS_DATABASE_PORT }}'
 
 INSIGHTS_LMS_COURSE_SHORTCUT_BASE_URL: "URL_FOR_LMS_COURSE_LIST_PAGE"