From 935ddb972f11b64ad4fc5a992434f3d756ebd51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Mon, 15 Jul 2019 01:16:55 +0000 Subject: [PATCH] db_setup: refactor database setup to a common file This patch refactors the database creation to db_setup.yml which will eventually be managed by openstack-ansible-tests. This also re-orders the mq_setup to be done earlier so these system M level dependencies are ready before service activation. Change-Id: Ibe6976b8f7ee56d74c2caf316ae5628e1926ef09 --- tasks/blazar_db_setup.yml | 26 ----------------- tasks/db_setup.yml | 40 ++++++++++++++++++++++++++ tasks/main.yml | 60 ++++++++++++++++++++++++--------------- 3 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 tasks/db_setup.yml diff --git a/tasks/blazar_db_setup.yml b/tasks/blazar_db_setup.yml index b0c211b..bb018b2 100644 --- a/tasks/blazar_db_setup.yml +++ b/tasks/blazar_db_setup.yml @@ -14,32 +14,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: "{{ blazar_galera_address }}" - name: "{{ blazar_galera_database }}" - state: "present" - delegate_to: "{{ blazar_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: "{{ blazar_galera_address }}" - name: "{{ blazar_galera_user }}" - password: "{{ blazar_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ blazar_galera_database }}.*:ALL" - delegate_to: "{{ blazar_db_setup_host }}" - with_items: - - "localhost" - - "%" - no_log: True - - name: Create blazar database schema command: > {{ blazar_bin }}/blazar-db-manage diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml new file mode 100644 index 0000000..a2cb43a --- /dev/null +++ b/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 diff --git a/tasks/main.yml b/tasks/main.yml index 3847ecb..bc88119 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,6 +26,37 @@ tags: - always +- import_tasks: db_setup.yml + when: + - "inventory_hostname == ((groups['blazar_all'] | intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslodb_setup_host: "{{ blazar_db_setup_host }}" + _oslodb_databases: + - name: "{{ blazar_galera_database }}" + users: + - username: "{{ blazar_galera_user }}" + password: "{{ blazar_container_mysql_password }}" + tags: + - common-db + - blazar-config + +- include_tasks: mq_setup.yml + when: + - "inventory_hostname == ((groups['blazar_all'] | intersect(ansible_play_hosts)) | list)[0]" + with_items: + - oslomsg_setup_host: "{{ blazar_oslomsg_rpc_setup_host }}" + oslomsg_userid: "{{ blazar_oslomsg_rpc_userid }}" + oslomsg_password: "{{ blazar_oslomsg_rpc_password }}" + oslomsg_vhost: "{{ blazar_oslomsg_rpc_vhost }}" + oslomsg_transport: "{{ blazar_oslomsg_rpc_transport }}" + - oslomsg_setup_host: "{{ blazar_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ blazar_oslomsg_notify_userid }}" + oslomsg_password: "{{ blazar_oslomsg_notify_password }}" + oslomsg_vhost: "{{ blazar_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ blazar_oslomsg_notify_transport }}" + tags: + - blazar-config + - include_tasks: blazar_pre_install.yml tags: - blazar-install @@ -51,6 +82,12 @@ tags: - blazar-config +- include_tasks: blazar_db_setup.yml + when: + - "inventory_hostname == ((groups['blazar_all'] | intersect(ansible_play_hosts)) | list)[0]" + tags: + - blazar-config + - name: Run the systemd service role include_role: name: systemd_service @@ -78,29 +115,6 @@ - blazar-config - systemd-service -- include_tasks: mq_setup.yml - when: - - "inventory_hostname == ((groups['blazar_all'] | intersect(ansible_play_hosts)) | list)[0]" - with_items: - - oslomsg_setup_host: "{{ blazar_oslomsg_rpc_setup_host }}" - oslomsg_userid: "{{ blazar_oslomsg_rpc_userid }}" - oslomsg_password: "{{ blazar_oslomsg_rpc_password }}" - oslomsg_vhost: "{{ blazar_oslomsg_rpc_vhost }}" - oslomsg_transport: "{{ blazar_oslomsg_rpc_transport }}" - - oslomsg_setup_host: "{{ blazar_oslomsg_notify_setup_host }}" - oslomsg_userid: "{{ blazar_oslomsg_notify_userid }}" - oslomsg_password: "{{ blazar_oslomsg_notify_password }}" - oslomsg_vhost: "{{ blazar_oslomsg_notify_vhost }}" - oslomsg_transport: "{{ blazar_oslomsg_notify_transport }}" - tags: - - blazar-config - -- include_tasks: blazar_db_setup.yml - when: - - "inventory_hostname == ((groups['blazar_all'] | intersect(ansible_play_hosts)) | list)[0]" - tags: - - blazar-config - - include_tasks: blazar_service_setup.yml when: - "inventory_hostname == ((groups['blazar_all'] | intersect(ansible_play_hosts)) | list)[0]"