Merge "db_setup: refactor database setup to a common file"

tasks/db_setup.yml

@@ -0,0 +1,40 @@
+---
+# Copyright 2019, VEXXHOST, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# WARNING:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/tasks/db_setup.yml
+# If you need to modify this file, update the one in the openstack-ansible-tests
+# repository. Once it merges there, the changes will automatically be proposed to
+# all the repositories which use it.
+
+- name: Setup Database Service (MariaDB)
+  delegate_to: "{{ _oslodb_setup_host }}"
+  tags:
+    - common-mariadb
+  block:
+    - name: Create database for service
+      mysql_db:
+        name: "{{ item.name }}"
+      loop: "{{ _oslodb_databases }}"
+
+    - name: Grant access to the database for the service
+      mysql_user:
+        name: "{{ item.1.username }}"
+        password: "{{ item.1.password }}"
+        host: "{{ item.1.host | default('%') }}"
+        priv: "{{ item.0.name }}.*:{{ item.1.priv | default('ALL') }}"
+      loop: "{{ _oslodb_databases | subelements('users') }}"
+      no_log: true

tasks/main.yml

@@ -25,6 +25,19 @@
   tags:
     - always
 
+- import_tasks: db_setup.yml
+  when: inventory_hostname == groups[rally_role_project_group][0]
+  vars:
+    _oslodb_setup_host: "{{ rally_db_setup_host }}"
+    _oslodb_databases:
+      - name: "{{ rally_galera_database }}"
+        users:
+          - username: "{{ rally_galera_user }}"
+            password: "{{ rally_galera_password }}"
+  tags:
+    - common-db
+    - rally-config
+
 - include_tasks: rally_pre_install.yml
   tags:
     - rally-install
@@ -51,4 +64,5 @@
 - include_tasks: rally_db_setup.yml
   when: inventory_hostname == groups[rally_role_project_group][0]
   tags:
+    - common-db
     - rally-config

tasks/rally_db_setup.yml

@@ -13,32 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Create DB for service
-  mysql_db:
-    login_user: "{{ galera_root_user }}"
-    login_password: "{{ galera_root_password }}"
-    login_host: "{{ rally_galera_address }}"
-    name: "{{ rally_galera_database }}"
-    state: "present"
-  delegate_to: "{{ rally_db_setup_host }}"
-  no_log: True
-
-- name: Grant access to the DB for the service
-  mysql_user:
-    login_user: "{{ galera_root_user }}"
-    login_password: "{{ galera_root_password }}"
-    login_host: "{{ rally_galera_address }}"
-    name: "{{ rally_galera_user }}"
-    password: "{{ rally_galera_password }}"
-    host: "{{ item }}"
-    state: "present"
-    priv: "{{ rally_galera_database }}.*:ALL"
-  delegate_to: "{{ rally_db_setup_host }}"
-  with_items:
-    - "localhost"
-    - "%"
-  no_log: True
-
 - name: Check for db
   command: "{{ rally_bin }}/rally deployment list"
   changed_when: false