Merge pull request #2323 from edx/clintonb/analytics-db-fix

Fixed analytics database issue

playbooks/roles/edxlocal/defaults/main.yml

@@ -15,6 +15,8 @@ edxlocal_databases:
   - "{{ EDXAPP_MYSQL_DB_NAME | default(None) }}"
   - "{{ EDX_NOTES_API_MYSQL_DB_NAME | default(None) }}"
   - "{{ PROGRAMS_DEFAULT_DB_NAME | default(None) }}"
+  - "{{ ANALYTICS_API_DEFAULT_DB_NAME | default(None) }}"
+  - "{{ ANALYTICS_API_REPORTS_DB_NAME | default(None) }}"
 
 edxlocal_database_users:
   - {
@@ -47,3 +49,8 @@ edxlocal_database_users:
       user: "{{ PROGRAMS_DATABASES.default.USER | default(None) }}",
       pass: "{{ PROGRAMS_DATABASES.default.PASSWORD | default(None) }}"
     }
+  - {
+      db: "{{ ANALYTICS_API_REPORTS_DB_NAME | default(None) }}",
+      user: "pipeline001",
+      pass: "password"
+    }

playbooks/roles/edxlocal/tasks/main.yml

@@ -68,16 +68,6 @@
   when: item != None and item != ''
   with_items: "{{ edxlocal_databases }}"
 
-- name: create databases for analytics api
-  mysql_db: >
-    db={{ item }}
-    state=present
-    encoding=utf8
-  when: ANALYTICS_API_SERVICE_CONFIG is defined
-  with_items:
-    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['default']['NAME'] }}"
-    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['reports']['NAME'] }}"
-
 - name: create api user for the analytics api
   mysql_user: >
     name=api001
@@ -92,13 +82,6 @@
     priv='{{ ANALYTICS_API_DATABASES.reports.NAME }}.*:SELECT'
   when: ANALYTICS_API_SERVICE_CONFIG is defined
 
-- name: create pipeline user for the analytics reports database
-  mysql_user: >
-    name="pipeline001"
-    password="password"
-    priv='{{ ANALYTICS_API_DATABASES.reports.NAME }}.*:ALL'
-  when: ANALYTICS_API_SERVICE_CONFIG is defined
-
 - name: create a database for thie hive metastore
   mysql_db: >
     db={{ HIVE_METASTORE_DATABASE.name }}