From 38a850b6f56f32c72bdea32ce12084fae595c490 Mon Sep 17 00:00:00 2001 From: Marcus Murwall Date: Thu, 22 Nov 2018 08:38:20 +0000 Subject: [PATCH] Adds support for changing port for keystone galera database. Added a new configure variable keystone_galera_port. Override the variable to set a specific port for the keystone database. Default value is 3306 Change-Id: Ia766f2d52fc830d2d1f12ca1a0978927e329a463 --- defaults/main.yml | 3 ++- tasks/keystone_db_setup.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index caf50951..958949a4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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_user: keystone keystone_galera_database: keystone +keystone_galera_port: 3306 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 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') }}" diff --git a/tasks/keystone_db_setup.yml b/tasks/keystone_db_setup.yml index bc98e378..2226264a 100644 --- a/tasks/keystone_db_setup.yml +++ b/tasks/keystone_db_setup.yml @@ -18,6 +18,7 @@ login_user: "{{ galera_root_user }}" login_password: "{{ galera_root_password }}" login_host: "{{ keystone_galera_address }}" + login_port: "{{ keystone_galera_port }}" name: "{{ keystone_galera_database }}" state: "present" delegate_to: "{{ keystone_db_setup_host }}" @@ -28,6 +29,7 @@ login_user: "{{ galera_root_user }}" login_password: "{{ galera_root_password }}" login_host: "{{ keystone_galera_address }}" + login_port: "{{ keystone_galera_port }}" name: "{{ keystone_galera_user }}" password: "{{ keystone_container_mysql_password }}" host: "{{ item }}"