From 0d4cf84f1edd2ebae3c6d203cd186da4a5b8e163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Mon, 17 Jun 2019 17:57:41 +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. Depends-On: https://review.opendev.org/668019 Change-Id: Ic8f7f2dc97cb8160bab123a87a2673675cff4c15 --- tasks/db_setup.yml | 40 ++++++++++++++++++++++++++++ tasks/main.yml | 55 +++++++++++++++++++++++++-------------- tasks/sahara_db_setup.yml | 45 -------------------------------- tasks/sahara_db_sync.yml | 19 ++++++++++++++ 4 files changed, 94 insertions(+), 65 deletions(-) create mode 100644 tasks/db_setup.yml delete mode 100644 tasks/sahara_db_setup.yml create mode 100644 tasks/sahara_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 10b2fb5..29d1dd1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,6 +23,40 @@ tags: - always +- import_tasks: db_setup.yml + when: + - "sahara_services['sahara-api']['group'] in group_names" + - "inventory_hostname == ((groups[sahara_services['sahara-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslodb_setup_host: "{{ sahara_db_setup_host }}" + _oslodb_databases: + - name: "{{ sahara_galera_database }}" + users: + - username: "{{ sahara_galera_user }}" + password: "{{ sahara_container_mysql_password }}" + tags: + - common-db + - sahara-config + +- import_tasks: mq_setup.yml + when: + - "sahara_services['sahara-api']['group'] in group_names" + - "inventory_hostname == ((groups[sahara_services['sahara-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslomsg_rpc_setup_host: "{{ sahara_oslomsg_rpc_setup_host }}" + _oslomsg_rpc_userid: "{{ sahara_oslomsg_rpc_userid }}" + _oslomsg_rpc_password: "{{ sahara_oslomsg_rpc_password }}" + _oslomsg_rpc_vhost: "{{ sahara_oslomsg_rpc_vhost }}" + _oslomsg_rpc_transport: "{{ sahara_oslomsg_rpc_transport }}" + _oslomsg_notify_setup_host: "{{ sahara_oslomsg_notify_setup_host }}" + _oslomsg_notify_userid: "{{ sahara_oslomsg_notify_userid }}" + _oslomsg_notify_password: "{{ sahara_oslomsg_notify_password }}" + _oslomsg_notify_vhost: "{{ sahara_oslomsg_notify_vhost }}" + _oslomsg_notify_transport: "{{ sahara_oslomsg_notify_transport }}" + tags: + - common-mq + - sahara-config + - include_tasks: sahara_pre_install.yml tags: - sahara-install @@ -59,26 +93,7 @@ tags: - sahara-config -- import_tasks: mq_setup.yml - when: - - "sahara_services['sahara-api']['group'] in group_names" - - "inventory_hostname == ((groups[sahara_services['sahara-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" - vars: - _oslomsg_rpc_setup_host: "{{ sahara_oslomsg_rpc_setup_host }}" - _oslomsg_rpc_userid: "{{ sahara_oslomsg_rpc_userid }}" - _oslomsg_rpc_password: "{{ sahara_oslomsg_rpc_password }}" - _oslomsg_rpc_vhost: "{{ sahara_oslomsg_rpc_vhost }}" - _oslomsg_rpc_transport: "{{ sahara_oslomsg_rpc_transport }}" - _oslomsg_notify_setup_host: "{{ sahara_oslomsg_notify_setup_host }}" - _oslomsg_notify_userid: "{{ sahara_oslomsg_notify_userid }}" - _oslomsg_notify_password: "{{ sahara_oslomsg_notify_password }}" - _oslomsg_notify_vhost: "{{ sahara_oslomsg_notify_vhost }}" - _oslomsg_notify_transport: "{{ sahara_oslomsg_notify_transport }}" - tags: - - common-mq - - sahara-config - -- include_tasks: sahara_db_setup.yml +- include_tasks: sahara_db_sync.yml when: inventory_hostname == groups['sahara_all'][0] tags: - sahara-config diff --git a/tasks/sahara_db_setup.yml b/tasks/sahara_db_setup.yml deleted file mode 100644 index f62cbd6..0000000 --- a/tasks/sahara_db_setup.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -# 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: "{{ sahara_galera_address }}" - name: "{{ sahara_galera_database }}" - state: "present" - delegate_to: "{{ sahara_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: "{{ sahara_galera_address }}" - name: "{{ sahara_galera_user }}" - password: "{{ sahara_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ sahara_galera_database }}.*:ALL" - delegate_to: "{{ sahara_db_setup_host }}" - with_items: - - "localhost" - - "%" - no_log: True - -- name: Perform a Sahara DB sync - command: "{{ sahara_bin }}/sahara-db-manage - --config-file {{ sahara_db_config }} upgrade head" - become: yes - become_user: "{{ sahara_system_user_name }}" - changed_when: false diff --git a/tasks/sahara_db_sync.yml b/tasks/sahara_db_sync.yml new file mode 100644 index 0000000..7be2c3e --- /dev/null +++ b/tasks/sahara_db_sync.yml @@ -0,0 +1,19 @@ +--- +# 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 Sahara DB sync + command: "{{ sahara_bin }}/sahara-db-manage + --config-file {{ sahara_db_config }} upgrade head" + become: yes + become_user: "{{ sahara_system_user_name }}" + changed_when: false