Use the utility host for db setup tasks
Move it to the service setup host (defaults to utility[0]) instead of the galera[0] host, and use galera_address (defaults to internal VIP) as the endpoint instead of a local connection on the db host. Change-Id: Ic57de36d5d240e6a5dda6e1794aa04d1f77fb962
This commit is contained in:
parent
767a11450c
commit
07d7845820
@ -103,7 +103,8 @@ zun_docker_api_version: false
|
||||
# zun_system_group_gid = <GID>
|
||||
|
||||
## Database info
|
||||
zun_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
|
||||
zun_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
|
||||
zun_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((zun_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
|
||||
zun_galera_address: "{{ galera_address | default('127.0.0.1') }}"
|
||||
zun_galera_user: zun
|
||||
zun_galera_database: zun
|
||||
@ -114,6 +115,7 @@ zun_db_pool_timeout: 30
|
||||
zun_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
|
||||
# The path where to store the database server CA certificate
|
||||
zun_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
|
||||
zun_galera_port: 3306
|
||||
|
||||
## RabbitMQ info
|
||||
|
||||
|
@ -22,12 +22,16 @@
|
||||
|
||||
- name: Setup Database Service (MariaDB)
|
||||
delegate_to: "{{ _oslodb_setup_host }}"
|
||||
vars:
|
||||
ansible_python_interpreter: "{{ _oslodb_ansible_python_interpreter }}"
|
||||
tags:
|
||||
- common-mariadb
|
||||
block:
|
||||
- name: Create database for service
|
||||
mysql_db:
|
||||
name: "{{ item.name }}"
|
||||
login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
|
||||
login_port: "{{ _oslodb_setup_port | default(omit) }}"
|
||||
loop: "{{ _oslodb_databases }}"
|
||||
no_log: true
|
||||
|
||||
@ -38,5 +42,7 @@
|
||||
host: "{{ item.1.host | default('%') }}"
|
||||
priv: "{{ item.0.name }}.*:{{ item.1.priv | default('ALL') }}"
|
||||
append_privs: yes
|
||||
login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
|
||||
login_port: "{{ _oslodb_setup_port | default(omit) }}"
|
||||
loop: "{{ _oslodb_databases | subelements('users') }}"
|
||||
no_log: true
|
||||
|
@ -72,6 +72,9 @@
|
||||
- import_tasks: db_setup.yml
|
||||
vars:
|
||||
_oslodb_setup_host: "{{ zun_db_setup_host }}"
|
||||
_oslodb_ansible_python_interpreter: "{{ zun_db_setup_python_interpreter }}"
|
||||
_oslodb_setup_endpoint: "{{ zun_galera_address }}"
|
||||
_oslodb_setup_port: "{{ zun_galera_port }}"
|
||||
_oslodb_databases:
|
||||
- name: "{{ zun_galera_database }}"
|
||||
users:
|
||||
|
Loading…
Reference in New Issue
Block a user