From e41bffedad352f50e980495d0886e43c12ea6b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Tue, 4 Jun 2019 03:13:08 +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: I1fd7d4ba9ad34732d76f1ed7030155a26742f0c9 --- tasks/db_setup.yml | 40 +++++++++++++++++++++++++++ tasks/main.yml | 55 +++++++++++++++++++++++-------------- tasks/masakari_db_setup.yml | 46 ------------------------------- tasks/masakari_db_sync.yml | 20 ++++++++++++++ 4 files changed, 95 insertions(+), 66 deletions(-) create mode 100644 tasks/db_setup.yml delete mode 100644 tasks/masakari_db_setup.yml create mode 100644 tasks/masakari_db_sync.yml 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 5ac0933..e413420 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,6 +25,40 @@ tags: - always +- import_tasks: db_setup.yml + when: + - "masakari_services['masakari-api']['group'] in group_names" + - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslodb_setup_host: "{{ masakari_db_setup_host }}" + _oslodb_databases: + - name: "{{ masakari_galera_database }}" + users: + - username: "{{ masakari_galera_user }}" + password: "{{ masakari_container_mysql_password }}" + tags: + - common-db + - masakari-config + +- import_tasks: mq_setup.yml + when: + - "masakari_services['masakari-api']['group'] in group_names" + - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslomsg_rpc_setup_host: "{{ masakari_oslomsg_rpc_setup_host }}" + _oslomsg_rpc_userid: "{{ masakari_oslomsg_rpc_userid }}" + _oslomsg_rpc_password: "{{ masakari_oslomsg_rpc_password }}" + _oslomsg_rpc_vhost: "{{ masakari_oslomsg_rpc_vhost }}" + _oslomsg_rpc_transport: "{{ masakari_oslomsg_rpc_transport }}" + _oslomsg_notify_setup_host: "{{ masakari_oslomsg_notify_setup_host }}" + _oslomsg_notify_userid: "{{ masakari_oslomsg_notify_userid }}" + _oslomsg_notify_password: "{{ masakari_oslomsg_notify_password }}" + _oslomsg_notify_vhost: "{{ masakari_oslomsg_notify_vhost }}" + _oslomsg_notify_transport: "{{ masakari_oslomsg_notify_transport }}" + tags: + - common-mq + - masakari-config + - import_tasks: masakari_pre_install.yml tags: - masakari-install @@ -79,26 +113,7 @@ - masakari-config - systemd-service -- import_tasks: mq_setup.yml - when: - - "masakari_services['masakari-api']['group'] in group_names" - - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" - vars: - _oslomsg_rpc_setup_host: "{{ masakari_oslomsg_rpc_setup_host }}" - _oslomsg_rpc_userid: "{{ masakari_oslomsg_rpc_userid }}" - _oslomsg_rpc_password: "{{ masakari_oslomsg_rpc_password }}" - _oslomsg_rpc_vhost: "{{ masakari_oslomsg_rpc_vhost }}" - _oslomsg_rpc_transport: "{{ masakari_oslomsg_rpc_transport }}" - _oslomsg_notify_setup_host: "{{ masakari_oslomsg_notify_setup_host }}" - _oslomsg_notify_userid: "{{ masakari_oslomsg_notify_userid }}" - _oslomsg_notify_password: "{{ masakari_oslomsg_notify_password }}" - _oslomsg_notify_vhost: "{{ masakari_oslomsg_notify_vhost }}" - _oslomsg_notify_transport: "{{ masakari_oslomsg_notify_transport }}" - tags: - - common-mq - - masakari-config - -- import_tasks: masakari_db_setup.yml +- import_tasks: masakari_db_sync.yml when: - "masakari_services['masakari-api']['group'] in group_names" - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" diff --git a/tasks/masakari_db_setup.yml b/tasks/masakari_db_setup.yml deleted file mode 100644 index 14f14ee..0000000 --- a/tasks/masakari_db_setup.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -# Copyright (c) 2018 NTT DATA -# -# 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 - -- name: Create DB for service - mysql_db: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ masakari_galera_address }}" - name: "{{ masakari_galera_database }}" - state: "present" - delegate_to: "{{ masakari_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: "{{ masakari_galera_address }}" - name: "{{ masakari_galera_user }}" - password: "{{ masakari_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ masakari_galera_database }}.*:ALL" - delegate_to: "{{ masakari_db_setup_host }}" - with_items: - - "localhost" - - "%" - no_log: True - -- name: Perform a synchronization of the Masakari database - command: "{{ masakari_bin }}/masakari-manage db sync" - become: yes - become_user: "{{ masakari_system_user_name }}" - changed_when: false diff --git a/tasks/masakari_db_sync.yml b/tasks/masakari_db_sync.yml new file mode 100644 index 0000000..5d6a306 --- /dev/null +++ b/tasks/masakari_db_sync.yml @@ -0,0 +1,20 @@ +--- +# Copyright (c) 2018 NTT DATA +# +# 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 + +- name: Perform a synchronization of the Masakari database + command: "{{ masakari_bin }}/masakari-manage db sync" + become: yes + become_user: "{{ masakari_system_user_name }}" + changed_when: false