Move credentials and discovery to edxlocal for database setup

N.B. This may break docker-based devstacks. Fix TBD.

playbooks/roles/ansible-role-django-ida/templates/defaults/main.yml.j2

@@ -30,9 +30,6 @@
     ATOMIC_REQUESTS: true
     CONN_MAX_AGE: 60
 
-{{ role_name|upper }}_DB_ADMIN_USER: 'root'
-{{ role_name|upper }}_DB_ADMIN_PASSWORD: ''
-{{ role_name|upper }}_MYSQL_MATCHER: 'localhost'
 
 {{ role_name|upper }}_MEMCACHE: [ 'memcache' ]
 

playbooks/roles/ansible-role-django-ida/templates/tasks/main.yml.j2

@@ -53,45 +53,6 @@
     - devstack
     - devstack:install
 
-- name: wait for database
-  wait_for:
-    host: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.HOST }}"
-    port: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.PORT }}"
-    delay: 2
-  tags:
-    - migrate
-    - migrate:install
-
-- name: create databases
-  mysql_db:
-    login_host: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.HOST }}"
-    login_user: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_USER }}"
-    login_password: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_PASSWORD }}"
-    db: "{{ '{{' }} {{ role_name|upper }}_DEFAULT_DB_NAME }}"
-    state: present
-    encoding: utf8
-  tags:
-    - migrate
-    - migrate:install
-
-- name: create database users
-  mysql_user:
-    login_host: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.HOST }}"
-    login_user: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_USER }}"
-    login_password: "{{ '{{' }} {{ role_name|upper }}_DB_ADMIN_PASSWORD }}"
-    name: "{{ '{{' }} item.name }}"
-    host: "{{ '{{' }} {{ role_name|upper }}_MYSQL_MATCHER }}"
-    password: "{{ '{{' }} item.password }}"
-    priv: "{{ '{{' }} {{ role_name|upper }}_DEFAULT_DB_NAME }}.*:ALL"
-  with_items:
-    - name: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.USER }}"
-      password: "{{ '{{' }} {{ role_name|upper }}_DATABASES.default.PASSWORD }}"
-    - name: "{{ '{{' }} COMMON_MYSQL_MIGRATE_USER }}"
-      password: "{{ '{{' }} COMMON_MYSQL_MIGRATE_PASS }}"
-  tags:
-    - migrate
-    - migrate:install
-
 - name: migrate database
   command: make migrate
   args:

playbooks/roles/credentials/tasks/main.yml

@@ -69,46 +69,6 @@
     - devstack
     - devstack:install
 
-- name: wait for database
-  wait_for:
-    host: "{{ CREDENTIALS_DATABASES.default.HOST }}"
-    port: "{{ CREDENTIALS_DATABASES.default.PORT }}"
-    delay: 2
-  tags:
-    - migrate
-    - migrate:install
-
-- name: create databases
-  mysql_db:
-    login_host: "{{ CREDENTIALS_DATABASES.default.HOST }}"
-    login_user: "{{ CREDENTIALS_DB_ADMIN_USER }}"
-    login_password: "{{ CREDENTIALS_DB_ADMIN_PASSWORD }}"
-    db: "{{ CREDENTIALS_DEFAULT_DB_NAME }}"
-    state: present
-    encoding: utf8
-  tags:
-    - migrate
-    - migrate:install
-
-- name: create database users
-  mysql_user:
-    login_host: "{{ CREDENTIALS_DATABASES.default.HOST }}"
-    login_user: "{{ CREDENTIALS_DB_ADMIN_USER }}"
-    login_password: "{{ CREDENTIALS_DB_ADMIN_PASSWORD }}"
-    name: "{{ item.name }}"
-    host: "{{ CREDENTIALS_MYSQL_MATCHER }}"
-    password: "{{ item.password }}"
-    priv: "{{ CREDENTIALS_DEFAULT_DB_NAME }}.*:ALL"
-    append_privs: yes
-  with_items:
-    - name: "{{ CREDENTIALS_DATABASES.default.USER }}"
-      password: "{{ CREDENTIALS_DATABASES.default.PASSWORD }}"
-    - name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
-      password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
-  tags:
-    - migrate
-    - migrate:install
-
 - name: migrate database
   command: make migrate
   args:

playbooks/roles/discovery/defaults/main.yml

@@ -44,10 +44,6 @@ DISCOVERY_ELASTICSEARCH:
   host: '{{ DISCOVERY_ELASTICSEARCH_HOST }}'
   index: '{{ DISCOVERY_ES_INDEX }}'
 
-DISCOVERY_DB_ADMIN_USER: 'root'
-DISCOVERY_DB_ADMIN_PASSWORD: ''
-DISCOVERY_MYSQL_MATCHER: 'localhost'
-
 DISCOVERY_MEMCACHE: [ 'memcache' ]
 
 DISCOVERY_CACHES:

playbooks/roles/discovery/tasks/main.yml

@@ -76,46 +76,6 @@
     - devstack
     - devstack:install
 
-- name: wait for database
-  wait_for:
-    host: "{{ DISCOVERY_DATABASES.default.HOST }}"
-    port: "{{ DISCOVERY_DATABASES.default.PORT }}"
-    delay: 2
-  tags:
-    - migrate
-    - migrate:install
-
-- name: create databases
-  mysql_db:
-    login_host: "{{ DISCOVERY_DATABASES.default.HOST }}"
-    login_user: "{{ DISCOVERY_DB_ADMIN_USER }}"
-    login_password: "{{ DISCOVERY_DB_ADMIN_PASSWORD }}"
-    db: "{{ DISCOVERY_DEFAULT_DB_NAME }}"
-    state: present
-    encoding: utf8
-  tags:
-    - migrate
-    - migrate:install
-
-- name: create database users
-  mysql_user:
-    login_host: "{{ DISCOVERY_DATABASES.default.HOST }}"
-    login_user: "{{ DISCOVERY_DB_ADMIN_USER }}"
-    login_password: "{{ DISCOVERY_DB_ADMIN_PASSWORD }}"
-    name: "{{ item.name }}"
-    host: "{{ DISCOVERY_MYSQL_MATCHER }}"
-    password: "{{ item.password }}"
-    priv: "{{ DISCOVERY_DEFAULT_DB_NAME }}.*:ALL"
-    append_privs: yes
-  with_items:
-    - name: "{{ DISCOVERY_DATABASES.default.USER }}"
-      password: "{{ DISCOVERY_DATABASES.default.PASSWORD }}"
-    - name: "{{ COMMON_MYSQL_MIGRATE_USER }}"
-      password: "{{ COMMON_MYSQL_MIGRATE_PASS }}"
-  tags:
-    - migrate
-    - migrate:install
-
 - name: migrate database
   command: make migrate
   args:

playbooks/roles/edxlocal/defaults/main.yml

@@ -13,6 +13,8 @@ edxlocal_databases:
   - "{{ 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) }}"
 
 edxlocal_database_users:
   - {
@@ -55,3 +57,13 @@ edxlocal_database_users:
       user: "{{ HIVE_METASTORE_DATABASE.user | default(None) }}",
       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) }}"
+    }
+  - {
+      db: "{{ DISCOVERY_DEFAULT_DB_NAME | default(None) }}",
+      user: "{{ DISCOVERY_MYSQL_USER | default(None) }}",
+      pass: "{{ DISCOVERY_MYSQL_PASSWORD | default(None) }}"
+    }