Define mariadb host priv user for migration and analytics

playbooks/roles/mariadb/defaults/main.yml

@@ -47,63 +47,53 @@ MARIADB_USERS:
   - {
       db: "{{ ECOMMERCE_DEFAULT_DB_NAME | default(None) }}",
       user: "{{ ECOMMERCE_DATABASE_USER | default(None) }}",
-      pass: "{{ ECOMMERCE_DATABASE_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ ECOMMERCE_DATABASE_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ INSIGHTS_DATABASE_NAME | default(None) }}",
       user: "{{ INSIGHTS_MYSQL_USER | default(None) }}",
-      pass: "{{ INSIGHTS_MYSQL_USER | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ INSIGHTS_MYSQL_USER | default(None) }}"
     }
   - {
       db: "{{ XQUEUE_MYSQL_DB_NAME | default(None) }}",
       user: "{{ XQUEUE_MYSQL_USER | default(None) }}",
-      pass: "{{ XQUEUE_MYSQL_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ XQUEUE_MYSQL_PASSWORD | default(None) }}"
 
     }
   - {
       db: "{{ EDXAPP_MYSQL_DB_NAME | default(None) }}",
       user: "{{ EDXAPP_MYSQL_USER | default(None) }}",
-      pass: "{{ EDXAPP_MYSQL_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ EDXAPP_MYSQL_PASSWORD | default(None) }}"
    }
   - {
       db: "{{ EDXAPP_MYSQL_CSMH_DB_NAME | default(None) }}",
       user: "{{ EDXAPP_MYSQL_CSMH_USER | default(None) }}",
-      pass: "{{ EDXAPP_MYSQL_CSMH_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ EDXAPP_MYSQL_CSMH_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ PROGRAMS_DEFAULT_DB_NAME | default(None) }}",
       user: "{{ PROGRAMS_DATABASE_USER | default(None) }}",
-      pass: "{{ PROGRAMS_DATABASE_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ PROGRAMS_DATABASE_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME | default(None) }}",
       user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_USER | default(None) }}",
-      pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      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) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ HIVE_METASTORE_DATABASE_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ CREDENTIALS_DEFAULT_DB_NAME | default(None) }}",
       user: "{{ CREDENTIALS_MYSQL_USER | default(None) }}",
-      pass: "{{ CREDENTIALS_MYSQL_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ CREDENTIALS_MYSQL_PASSWORD | default(None) }}"
     }
   - {
       db: "{{ DISCOVERY_DEFAULT_DB_NAME | default(None) }}",
       user: "{{ DISCOVERY_MYSQL_USER | default(None) }}",
-      pass: "{{ DISCOVERY_MYSQL_PASSWORD | default(None) }}",
-      host: "{{ MARIADB_HOST_PRIV }}"
+      pass: "{{ DISCOVERY_MYSQL_PASSWORD | default(None) }}"
     }
 
 #

playbooks/roles/mariadb/tasks/main.yml

@@ -76,7 +76,7 @@
     name: "{{ item.user }}"
     password: "{{ item.pass }}"
     priv: "{{ item.db }}.*:ALL"
-    host: "{{ item.host }}"
+    host: "{{ MARIADB_HOST_PRIV }}"
     append_privs: yes
   when: item.db != None and item.db != ''
   with_items: "{{ MARIADB_USERS }}"
@@ -86,6 +86,7 @@
     name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
     password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
     priv: "{{ item }}.*:ALL"
+    host: "{{ MARIADB_HOST_PRIV }}"
     append_privs: yes
   when: item != None and item != ''
   with_items: "{{ MARIADB_DATABASES }}"
@@ -95,6 +96,7 @@
     name: "api001"
     password: "{{ ANALYTICS_API_DATABASES.default.PASSWORD }}"
     priv: '{{ ANALYTICS_API_DATABASES.default.NAME }}.*:ALL/reports.*:SELECT'
+    host: "{{ MARIADB_HOST_PRIV }}"
   when: ANALYTICS_API_SERVICE_CONFIG is defined
 
 - name: create read-only reports user for the analytics-api
@@ -102,6 +104,7 @@
     name: reports001
     password: "{{ ANALYTICS_API_DATABASES.reports.PASSWORD }}"
     priv: '{{ ANALYTICS_API_DATABASES.reports.NAME }}.*:SELECT'
+    host: "{{ MARIADB_HOST_PRIV }}" 
   when: ANALYTICS_API_SERVICE_CONFIG is defined
 
 - name: create a database for the hive metastore
@@ -116,6 +119,7 @@
     name: "{{ EDX_NOTES_API_MYSQL_DB_USER }}"
     password: "{{ EDX_NOTES_API_MYSQL_DB_PASS }}"
     priv: "{{ EDX_NOTES_API_MYSQL_DB_NAME }}.*:SELECT,INSERT,UPDATE,DELETE"
+    host: "{{ MARIADB_HOST_PRIV }}"
   when: EDX_NOTES_API_MYSQL_DB_USER is defined
 
 - name: setup the read-only db user