openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Use the utility host for db setup tasks"

Browse Source
This commit is contained in:
Zuul 2020-08-25 09:25:02 +00:00 committed by Gerrit Code Review
commit 083ede68bb
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -212,7 +212,8 @@ neutron_quota_firewall_rule: 100
### DB (Galera) integration ### DB (Galera) integration
### ###
neutron_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}" neutron_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
neutron_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((neutron_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
neutron_galera_address: "{{ galera_address | default('127.0.0.1') }}" neutron_galera_address: "{{ galera_address | default('127.0.0.1') }}"
neutron_galera_user: neutron neutron_galera_user: neutron
neutron_galera_database: neutron neutron_galera_database: neutron
@ -221,6 +222,7 @@ neutron_db_pool_size: 120
neutron_db_pool_timeout: 30 neutron_db_pool_timeout: 30
neutron_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" neutron_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
neutron_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" neutron_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
neutron_galera_port: 3306
### ###
### Oslo Messaging ### Oslo Messaging

6
tasks/db_setup.yml
View File

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

3
tasks/main.yml
View File

@ -38,6 +38,9 @@
- "inventory_hostname == ((groups[neutron_services['neutron-server']['group']] | intersect(ansible_play_hosts)) | list)[0]" - "inventory_hostname == ((groups[neutron_services['neutron-server']['group']] | intersect(ansible_play_hosts)) | list)[0]"
vars: vars:
_oslodb_setup_host: "{{ neutron_db_setup_host }}" _oslodb_setup_host: "{{ neutron_db_setup_host }}"
_oslodb_ansible_python_interpreter: "{{ neutron_db_setup_python_interpreter }}"
_oslodb_setup_endpoint: "{{ neutron_galera_address }}"
_oslodb_setup_port: "{{ neutron_galera_port }}"
_oslodb_databases: _oslodb_databases:
- name: "{{ neutron_galera_database }}" - name: "{{ neutron_galera_database }}"
users: users: