Add Hive database to database creation procedure

playbooks/roles/mariadb/defaults/main.yml

@@ -31,17 +31,54 @@ MARIADB_HAPROXY_HOSTS:
 MARIADB_LISTEN_ALL: false
 
 MARIADB_DATABASES:
-  - "{{ ECOMMERCE_DEFAULT_DB_NAME | default(None) }}"
-  - "{{ INSIGHTS_DATABASE_NAME | default(None) }}"
-  - "{{ XQUEUE_MYSQL_DB_NAME | default(None) }}"
-  - "{{ EDXAPP_MYSQL_DB_NAME | default(None) }}"
-  - "{{ EDXAPP_MYSQL_CSMH_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) }}"
-  - "{{ CREDENTIALS_DEFAULT_DB_NAME | default(None) }}"
-  - "{{ DISCOVERY_DEFAULT_DB_NAME | default(None) }}"
+  - {
+      db: "{{ ECOMMERCE_DEFAULT_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ INSIGHTS_DATABASE_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ XQUEUE_MYSQL_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ EDXAPP_MYSQL_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ EDXAPP_MYSQL_CSMH_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ EDX_NOTES_API_MYSQL_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ PROGRAMS_DEFAULT_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ ANALYTICS_API_DEFAULT_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ ANALYTICS_API_REPORTS_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ CREDENTIALS_DEFAULT_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ DISCOVERY_DEFAULT_DB_NAME | default(None) }}",
+      encoding: "utf8" 
+    }
+  - {
+      db: "{{ HIVE_METASTORE_DATABASE_NAME | default(None) }}",
+      encoding: "latin1" 
+    }
 
 MARIADB_USERS:
   - {

playbooks/roles/mariadb/tasks/main.yml

@@ -65,9 +65,9 @@
 
 - name: create databases
   mysql_db:
-    db: "{{ item }}"
+    db: "{{ item.db }}"
     state: present
-    encoding: utf8
+    encoding: "{{ item.encoding }}"
   when: item != None and item != '' and MARIADB_CREATE_DBS|bool
   with_items: "{{ MARIADB_DATABASES }}"
 
@@ -85,7 +85,7 @@
   mysql_user:
     name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
     password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
-    priv: "{{ item }}.*:ALL"
+    priv: "{{ item.db }}.*:ALL"
     host: "{{ MARIADB_HOST_PRIV }}"
     append_privs: yes
   when: item != None and item != ''
@@ -107,13 +107,6 @@
     host: "{{ MARIADB_HOST_PRIV }}" 
   when: ANALYTICS_API_SERVICE_CONFIG is defined
 
-- name: create a database for the hive metastore
-  mysql_db:
-    db: "{{ HIVE_METASTORE_DATABASE.name }}"
-    state: "present"
-    encoding: "latin1"
-  when: HIVE_METASTORE_DATABASE is defined
-
 - name: setup the edx-notes-api db user
   mysql_user:
     name: "{{ EDX_NOTES_API_MYSQL_DB_USER }}"