openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Merge "Adds support for changing port for keystone galera database."

Browse Source
This commit is contained in:
Zuul 2018-11-30 15:13:49 +00:00 committed by Gerrit Code Review
commit fbe706e5df
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -112,8 +112,9 @@ keystone_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_al
keystone_galera_address: "{{ galera_address | default('127.0.0.1') }}" keystone_galera_address: "{{ galera_address | default('127.0.0.1') }}"
keystone_galera_user: keystone keystone_galera_user: keystone
keystone_galera_database: keystone keystone_galera_database: keystone
keystone_galera_port: 3306
keystone_database_connection_string: >- keystone_database_connection_string: >-
mysql+pymysql://{{ keystone_galera_user }}:{{ keystone_container_mysql_password }}@{{ keystone_galera_address }}/{{ keystone_galera_database }}?charset=utf8{% if keystone_galera_use_ssl | bool %}&ssl_ca={{ keystone_galera_ssl_ca_cert }}{% endif %} mysql+pymysql://{{ keystone_galera_user }}:{{ keystone_container_mysql_password }}@{{ keystone_galera_address }}:{{keystone_galera_port}}/{{ keystone_galera_database }}?charset=utf8{% if keystone_galera_use_ssl | bool %}&ssl_ca={{ keystone_galera_ssl_ca_cert }}{% endif %}
## Database SSL ## Database SSL
keystone_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" keystone_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
keystone_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" keystone_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"

2
tasks/keystone_db_setup.yml
View File

@ -18,6 +18,7 @@
login_user: "{{ galera_root_user }}" login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}" login_password: "{{ galera_root_password }}"
login_host: "{{ keystone_galera_address }}" login_host: "{{ keystone_galera_address }}"
login_port: "{{ keystone_galera_port }}"
name: "{{ keystone_galera_database }}" name: "{{ keystone_galera_database }}"
state: "present" state: "present"
delegate_to: "{{ keystone_db_setup_host }}" delegate_to: "{{ keystone_db_setup_host }}"
@ -28,6 +29,7 @@
login_user: "{{ galera_root_user }}" login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}" login_password: "{{ galera_root_password }}"
login_host: "{{ keystone_galera_address }}" login_host: "{{ keystone_galera_address }}"
login_port: "{{ keystone_galera_port }}"
name: "{{ keystone_galera_user }}" name: "{{ keystone_galera_user }}"
password: "{{ keystone_container_mysql_password }}" password: "{{ keystone_container_mysql_password }}"
host: "{{ item }}" host: "{{ item }}"