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: I08bde61baa956dfb190895b1d29ff3ff9df6ff91
This commit is contained in:
Guilherme Steinmüller 2019-06-04 02:31:26 +00:00
parent 073199dbdc
commit d9dfa325c5
3 changed files with 75 additions and 45 deletions

41
tasks/db_setup.yml Normal file
View File

@ -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

View File

@ -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: "{{ ironic_galera_address }}"
name: "{{ ironic_galera_database }}"
state: "present"
delegate_to: "{{ ironic_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: "{{ ironic_galera_address }}"
name: "{{ ironic_galera_user }}"
password: "{{ ironic_container_mysql_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ ironic_galera_database }}.*:ALL"
delegate_to: "{{ ironic_db_setup_host }}"
with_items:
- "localhost"
- "%"
no_log: True
- name: Update database schema
command: "{{ ironic_bin }}/ironic-dbsync upgrade"
become: yes

View File

@ -24,6 +24,40 @@
tags:
- always
- import_tasks: db_setup.yml
when:
- "ironic_services['ironic-api']['group'] in group_names"
- "inventory_hostname == ((groups[ironic_services['ironic-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
vars:
_oslodb_setup_host: "{{ ironic_db_setup_host }}"
_oslodb_databases:
- name: "{{ ironic_galera_database }}"
users:
- username: "{{ ironic_galera_user }}"
password: "{{ ironic_container_mysql_password }}"
tags:
- common-db
- ironic-config
- import_tasks: mq_setup.yml
when:
- "ironic_services['ironic-api']['group'] in group_names"
- "inventory_hostname == ((groups[ironic_services['ironic-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
vars:
_oslomsg_rpc_setup_host: "{{ ironic_oslomsg_rpc_setup_host }}"
_oslomsg_rpc_userid: "{{ ironic_oslomsg_rpc_userid }}"
_oslomsg_rpc_password: "{{ ironic_oslomsg_rpc_password }}"
_oslomsg_rpc_vhost: "{{ ironic_oslomsg_rpc_vhost }}"
_oslomsg_rpc_transport: "{{ ironic_oslomsg_rpc_transport }}"
_oslomsg_notify_setup_host: "{{ ironic_oslomsg_notify_setup_host }}"
_oslomsg_notify_userid: "{{ ironic_oslomsg_notify_userid }}"
_oslomsg_notify_password: "{{ ironic_oslomsg_notify_password }}"
_oslomsg_notify_vhost: "{{ ironic_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ ironic_oslomsg_notify_transport }}"
tags:
- common-mq
- ironic-config
- include_tasks: ironic_pre_install.yml
tags:
- ironic-install
@ -58,25 +92,6 @@
tags:
- ironic-config
- import_tasks: mq_setup.yml
when:
- "ironic_services['ironic-api']['group'] in group_names"
- "inventory_hostname == ((groups[ironic_services['ironic-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
vars:
_oslomsg_rpc_setup_host: "{{ ironic_oslomsg_rpc_setup_host }}"
_oslomsg_rpc_userid: "{{ ironic_oslomsg_rpc_userid }}"
_oslomsg_rpc_password: "{{ ironic_oslomsg_rpc_password }}"
_oslomsg_rpc_vhost: "{{ ironic_oslomsg_rpc_vhost }}"
_oslomsg_rpc_transport: "{{ ironic_oslomsg_rpc_transport }}"
_oslomsg_notify_setup_host: "{{ ironic_oslomsg_notify_setup_host }}"
_oslomsg_notify_userid: "{{ ironic_oslomsg_notify_userid }}"
_oslomsg_notify_password: "{{ ironic_oslomsg_notify_password }}"
_oslomsg_notify_vhost: "{{ ironic_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ ironic_oslomsg_notify_transport }}"
tags:
- common-mq
- ironic-config
- include_tasks: ironic_db_setup.yml
when: inventory_hostname == groups['ironic_conductor'][0]
tags: