From b045ba329a758d99dd3fdfc36374b515e818bf73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Thu, 30 May 2019 20:46:06 +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: Icfbd5c17da0c1854e6aa15094122bb911665a95e --- tasks/db_setup.yml | 41 +++++++++++++++++++++++++++++ tasks/main.yml | 53 ++++++++++++++++++++++++-------------- tasks/neutron_db_setup.yml | 28 -------------------- 3 files changed, 75 insertions(+), 47 deletions(-) create mode 100644 tasks/db_setup.yml 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 d636224b..b617bb8d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,6 +32,40 @@ tags: - always +- import_tasks: db_setup.yml + when: + - "neutron_services['neutron-server']['group'] in group_names" + - "inventory_hostname == ((groups[neutron_services['neutron-server']['group']] | intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslodb_setup_host: "{{ neutron_db_setup_host }}" + _oslodb_databases: + - name: "{{ neutron_galera_database }}" + users: + - username: "{{ neutron_galera_user }}" + password: "{{ neutron_container_mysql_password }}" + tags: + - common-db + - neutron-config + +- import_tasks: mq_setup.yml + when: + - "neutron_services['neutron-server']['group'] in group_names" + - "inventory_hostname == ((groups[neutron_services['neutron-server']['group']]| intersect(ansible_play_hosts)) | list)[0]" + vars: + _oslomsg_rpc_setup_host: "{{ neutron_oslomsg_rpc_setup_host }}" + _oslomsg_rpc_userid: "{{ neutron_oslomsg_rpc_userid }}" + _oslomsg_rpc_password: "{{ neutron_oslomsg_rpc_password }}" + _oslomsg_rpc_vhost: "{{ neutron_oslomsg_rpc_vhost }}" + _oslomsg_rpc_transport: "{{ neutron_oslomsg_rpc_transport }}" + _oslomsg_notify_setup_host: "{{ neutron_oslomsg_notify_setup_host }}" + _oslomsg_notify_userid: "{{ neutron_oslomsg_notify_userid }}" + _oslomsg_notify_password: "{{ neutron_oslomsg_notify_password }}" + _oslomsg_notify_vhost: "{{ neutron_oslomsg_notify_vhost }}" + _oslomsg_notify_transport: "{{ neutron_oslomsg_notify_transport }}" + tags: + - common-mq + - neutron-config + - name: Get CPU info content and store as var command: cat /proc/cpuinfo register: cpuinfo_contents @@ -121,25 +155,6 @@ - neutron-config - systemd-service -- import_tasks: mq_setup.yml - when: - - "neutron_services['neutron-server']['group'] in group_names" - - "inventory_hostname == ((groups[neutron_services['neutron-server']['group']]| intersect(ansible_play_hosts)) | list)[0]" - vars: - _oslomsg_rpc_setup_host: "{{ neutron_oslomsg_rpc_setup_host }}" - _oslomsg_rpc_userid: "{{ neutron_oslomsg_rpc_userid }}" - _oslomsg_rpc_password: "{{ neutron_oslomsg_rpc_password }}" - _oslomsg_rpc_vhost: "{{ neutron_oslomsg_rpc_vhost }}" - _oslomsg_rpc_transport: "{{ neutron_oslomsg_rpc_transport }}" - _oslomsg_notify_setup_host: "{{ neutron_oslomsg_notify_setup_host }}" - _oslomsg_notify_userid: "{{ neutron_oslomsg_notify_userid }}" - _oslomsg_notify_password: "{{ neutron_oslomsg_notify_password }}" - _oslomsg_notify_vhost: "{{ neutron_oslomsg_notify_vhost }}" - _oslomsg_notify_transport: "{{ neutron_oslomsg_notify_transport }}" - tags: - - common-mq - - neutron-config - - import_tasks: neutron_db_setup.yml when: - "neutron_services['neutron-server']['group'] in group_names" diff --git a/tasks/neutron_db_setup.yml b/tasks/neutron_db_setup.yml index 99df6f94..433be98d 100644 --- a/tasks/neutron_db_setup.yml +++ b/tasks/neutron_db_setup.yml @@ -13,34 +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: "{{ neutron_galera_address }}" - name: "{{ neutron_galera_database }}" - state: "present" - delegate_to: "{{ neutron_db_setup_host }}" - no_log: True - when: "inventory_hostname == ((groups[neutron_services['neutron-server']['group']]| intersect(ansible_play_hosts)) | list)[0]" - -- name: Grant access to the DB for the service - mysql_user: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ neutron_galera_address }}" - name: "{{ neutron_galera_user }}" - password: "{{ neutron_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ neutron_galera_database }}.*:ALL" - delegate_to: "{{ neutron_db_setup_host }}" - with_items: - - "localhost" - - "%" - no_log: True - when: "inventory_hostname == ((groups[neutron_services['neutron-server']['group']]| intersect(ansible_play_hosts)) | list)[0]" - - name: Perform a DB expand command: "{{ neutron_bin }}/neutron-db-manage upgrade --expand" become: yes