From 0f4b8f276007d287c46a3c032796710cf002f6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Thu, 30 May 2019 19:12:17 +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 level dependencies are ready before service activation. Change-Id: I9bbfe5fb6e1c9f235ec4177ee3f0eedab2afd4e4 --- ...cinder_db_setup.yml => cinder_db_sync.yml} | 26 --------- tasks/db_setup.yml | 41 ++++++++++++++ tasks/main.yml | 55 ++++++++++++------- 3 files changed, 76 insertions(+), 46 deletions(-) rename tasks/{cinder_db_setup.yml => cinder_db_sync.yml} (64%) create mode 100644 tasks/db_setup.yml diff --git a/tasks/cinder_db_setup.yml b/tasks/cinder_db_sync.yml similarity index 64% rename from tasks/cinder_db_setup.yml rename to tasks/cinder_db_sync.yml index 30e68cfc..70e13ad7 100644 --- a/tasks/cinder_db_setup.yml +++ b/tasks/cinder_db_sync.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: "{{ cinder_galera_address }}" - name: "{{ cinder_galera_database }}" - state: "present" - delegate_to: "{{ cinder_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: "{{ cinder_galera_address }}" - name: "{{ cinder_galera_user }}" - password: "{{ cinder_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ cinder_galera_database }}.*:ALL" - delegate_to: "{{ cinder_db_setup_host }}" - with_items: - - "localhost" - - "%" - no_log: True - - name: Perform a cinder DB sync command: "{{ cinder_bin }}/cinder-manage db sync" become: yes diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml new file mode 100644 index 00000000..cdd8e940 --- /dev/null +++ b/tasks/db_setup.yml @@ -0,0 +1,41 @@ +--- +# 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') }}" + append_privs: yes + loop: "{{ _oslodb_databases | subelements('users') }}" + no_log: true diff --git a/tasks/main.yml b/tasks/main.yml index 01ba5253..1c3c4266 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -40,6 +40,40 @@ tags: - always +- import_tasks: db_setup.yml + when: + - "cinder_services['cinder-api']['group'] in group_names" + - "inventory_hostname == ((groups[cinder_services['cinder-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslodb_setup_host: "{{ cinder_db_setup_host }}" + _oslodb_databases: + - name: "{{ cinder_galera_database }}" + users: + - username: "{{ cinder_galera_user }}" + password: "{{ cinder_container_mysql_password }}" + tags: + - common-db + - cinder-config + +- import_tasks: mq_setup.yml + when: + - "cinder_services['cinder-api']['group'] in group_names" + - "inventory_hostname == ((groups[cinder_services['cinder-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslomsg_rpc_setup_host: "{{ cinder_oslomsg_rpc_setup_host }}" + _oslomsg_rpc_userid: "{{ cinder_oslomsg_rpc_userid }}" + _oslomsg_rpc_password: "{{ cinder_oslomsg_rpc_password }}" + _oslomsg_rpc_vhost: "{{ cinder_oslomsg_rpc_vhost }}" + _oslomsg_rpc_transport: "{{ cinder_oslomsg_rpc_transport }}" + _oslomsg_notify_setup_host: "{{ cinder_oslomsg_notify_setup_host }}" + _oslomsg_notify_userid: "{{ cinder_oslomsg_notify_userid }}" + _oslomsg_notify_password: "{{ cinder_oslomsg_notify_password }}" + _oslomsg_notify_vhost: "{{ cinder_oslomsg_notify_vhost }}" + _oslomsg_notify_transport: "{{ cinder_oslomsg_notify_transport }}" + tags: + - common-mq + - cinder-config + - include: cinder_lvm_config.yml when: - "cinder_services['cinder-volume']['group'] in group_names" @@ -93,26 +127,7 @@ tags: - cinder-config -- import_tasks: mq_setup.yml - when: - - "cinder_services['cinder-api']['group'] in group_names" - - "inventory_hostname == ((groups[cinder_services['cinder-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" - vars: - _oslomsg_rpc_setup_host: "{{ cinder_oslomsg_rpc_setup_host }}" - _oslomsg_rpc_userid: "{{ cinder_oslomsg_rpc_userid }}" - _oslomsg_rpc_password: "{{ cinder_oslomsg_rpc_password }}" - _oslomsg_rpc_vhost: "{{ cinder_oslomsg_rpc_vhost }}" - _oslomsg_rpc_transport: "{{ cinder_oslomsg_rpc_transport }}" - _oslomsg_notify_setup_host: "{{ cinder_oslomsg_notify_setup_host }}" - _oslomsg_notify_userid: "{{ cinder_oslomsg_notify_userid }}" - _oslomsg_notify_password: "{{ cinder_oslomsg_notify_password }}" - _oslomsg_notify_vhost: "{{ cinder_oslomsg_notify_vhost }}" - _oslomsg_notify_transport: "{{ cinder_oslomsg_notify_transport }}" - tags: - - common-mq - - cinder-config - -- include_tasks: cinder_db_setup.yml +- include_tasks: cinder_db_sync.yml when: - "groups['cinder_api'] | length > 0" - "cinder_services['cinder-api']['group'] in group_names"