diff --git a/defaults/main.yml b/defaults/main.yml index ae22c9d..e3a6fa2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -89,7 +89,7 @@ magnum_galera_address: "{{ galera_address | default('127.0.0.1') }}" magnum_galera_database_name: magnum_service magnum_galera_user: magnum magnum_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" -magnum_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" +magnum_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}" magnum_galera_port: "{{ galera_port | default('3306') }}" # Oslo Messaging vars diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2 index 5bda2ea..5c4edf3 100644 --- a/templates/magnum.conf.j2 +++ b/templates/magnum.conf.j2 @@ -23,7 +23,7 @@ region_name = {{ magnum_cinder_service_region }} endpoint_type = internalURL [database] -connection = mysql+pymysql://{{ magnum_galera_user }}:{{ magnum_galera_password }}@{{ magnum_galera_address }}/{{ magnum_galera_database_name }}?charset=utf8{% if magnum_galera_use_ssl | bool %}&ssl_ca={{ magnum_galera_ssl_ca_cert }}{% endif %} +connection = mysql+pymysql://{{ magnum_galera_user }}:{{ magnum_galera_password }}@{{ magnum_galera_address }}/{{ magnum_galera_database_name }}?charset=utf8{% if magnum_galera_use_ssl | bool %}&ssl_verify_cert=true{% if magnum_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ magnum_galera_ssl_ca_cert }}{% endif %}{% endif %} [glance_client] region_name = {{ magnum_glance_service_region }}