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: I3d7688ea29f1eb4d65dd50ae82d157f988e404af
This commit is contained in:
parent
33653b4626
commit
56f11c554c
|
@ -35,8 +35,10 @@ rally_venv_tag: "{{ venv_tag | default('untagged') }}"
|
||||||
rally_bin: "/openstack/venvs/rally-{{ rally_venv_tag }}/bin"
|
rally_bin: "/openstack/venvs/rally-{{ rally_venv_tag }}/bin"
|
||||||
|
|
||||||
# Database vars
|
# Database vars
|
||||||
rally_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
|
rally_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
|
||||||
|
rally_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((rally_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
|
||||||
rally_galera_address: "{{ galera_address | default('127.0.0.1') }}"
|
rally_galera_address: "{{ galera_address | default('127.0.0.1') }}"
|
||||||
|
rally_galera_port: 3306
|
||||||
rally_galera_database: rally
|
rally_galera_database: rally
|
||||||
rally_galera_user: rally
|
rally_galera_user: rally
|
||||||
rally_database_connection_string: mysql+pymysql://{{ rally_galera_user }}:{{ rally_galera_password }}@{{ rally_galera_address }}/{{ rally_galera_database }}?charset=utf8
|
rally_database_connection_string: mysql+pymysql://{{ rally_galera_user }}:{{ rally_galera_password }}@{{ rally_galera_address }}/{{ rally_galera_database }}?charset=utf8
|
||||||
|
|
|
@ -22,12 +22,16 @@
|
||||||
|
|
||||||
- name: Setup Database Service (MariaDB)
|
- name: Setup Database Service (MariaDB)
|
||||||
delegate_to: "{{ _oslodb_setup_host }}"
|
delegate_to: "{{ _oslodb_setup_host }}"
|
||||||
|
vars:
|
||||||
|
ansible_python_interpreter: "{{ _oslodb_ansible_python_interpreter }}"
|
||||||
tags:
|
tags:
|
||||||
- common-mariadb
|
- common-mariadb
|
||||||
block:
|
block:
|
||||||
- name: Create database for service
|
- name: Create database for service
|
||||||
mysql_db:
|
mysql_db:
|
||||||
name: "{{ item.name }}"
|
name: "{{ item.name }}"
|
||||||
|
login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
|
||||||
|
login_port: "{{ _oslodb_setup_port | default(omit) }}"
|
||||||
loop: "{{ _oslodb_databases }}"
|
loop: "{{ _oslodb_databases }}"
|
||||||
no_log: true
|
no_log: true
|
||||||
|
|
||||||
|
@ -38,5 +42,7 @@
|
||||||
host: "{{ item.1.host | default('%') }}"
|
host: "{{ item.1.host | default('%') }}"
|
||||||
priv: "{{ item.0.name }}.*:{{ item.1.priv | default('ALL') }}"
|
priv: "{{ item.0.name }}.*:{{ item.1.priv | default('ALL') }}"
|
||||||
append_privs: yes
|
append_privs: yes
|
||||||
|
login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
|
||||||
|
login_port: "{{ _oslodb_setup_port | default(omit) }}"
|
||||||
loop: "{{ _oslodb_databases | subelements('users') }}"
|
loop: "{{ _oslodb_databases | subelements('users') }}"
|
||||||
no_log: true
|
no_log: true
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
when: inventory_hostname == groups['utility_all'][0]
|
when: inventory_hostname == groups['utility_all'][0]
|
||||||
vars:
|
vars:
|
||||||
_oslodb_setup_host: "{{ rally_db_setup_host }}"
|
_oslodb_setup_host: "{{ rally_db_setup_host }}"
|
||||||
|
_oslodb_ansible_python_interpreter: "{{ rally_db_setup_python_interpreter }}"
|
||||||
|
_oslodb_setup_endpoint: "{{ rally_galera_address }}"
|
||||||
|
_oslodb_setup_port: "{{ rally_galera_port }}"
|
||||||
_oslodb_databases:
|
_oslodb_databases:
|
||||||
- name: "{{ rally_galera_database }}"
|
- name: "{{ rally_galera_database }}"
|
||||||
users:
|
users:
|
||||||
|
|
Loading…
Reference in New Issue