diff --git a/defaults/main.yml b/defaults/main.yml index 31242529..343e4359 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -217,7 +217,7 @@ neutron_db_max_overflow: 20 neutron_db_pool_size: 120 neutron_db_pool_timeout: 30 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('') }}" neutron_galera_port: "{{ galera_port | default('3306') }}" ### diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 02038f99..ff474bd1 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -197,7 +197,7 @@ memcache_use_advanced_pool = True # Database [database] -connection = mysql+pymysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}/{{ neutron_galera_database }}?charset=utf8{% if neutron_galera_use_ssl | bool %}&ssl_ca={{ neutron_galera_ssl_ca_cert }}{% endif %} +connection = mysql+pymysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}/{{ neutron_galera_database }}?charset=utf8{% if neutron_galera_use_ssl | bool %}&ssl_verify_cert=true{% if neutron_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ neutron_galera_ssl_ca_cert }}{% endif %}{% endif %} max_overflow = {{ neutron_db_max_overflow }} max_pool_size = {{ neutron_db_pool_size }}