diff --git a/defaults/main.yml b/defaults/main.yml index 7089a23..559ba1e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -95,7 +95,7 @@ sahara_galera_address: "{{ galera_address | default('127.0.0.1') }}" sahara_galera_database: sahara sahara_galera_user: sahara sahara_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" -sahara_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" +sahara_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}" sahara_galera_port: "{{ galera_port | default('3306') }}" sahara_role_name: admin diff --git a/templates/sahara.conf.j2 b/templates/sahara.conf.j2 index caf9abe..3649196 100644 --- a/templates/sahara.conf.j2 +++ b/templates/sahara.conf.j2 @@ -27,7 +27,7 @@ proxy_user_role_names = {{ sahara_proxy_user_role_names }} transport_url = {{ sahara_oslomsg_rpc_transport }}://{% for host in sahara_oslomsg_rpc_servers.split(',') %}{{ sahara_oslomsg_rpc_userid }}:{{ sahara_oslomsg_rpc_password }}@{{ host }}:{{ sahara_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ sahara_oslomsg_rpc_vhost }}{% if sahara_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ sahara_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ sahara_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [database] -connection = mysql+pymysql://{{ sahara_galera_user }}:{{ sahara_container_mysql_password }}@{{ sahara_galera_address }}/{{ sahara_galera_database }}?charset=utf8{% if sahara_galera_use_ssl | bool %}&ssl_ca={{ sahara_galera_ssl_ca_cert }}{% endif %} +connection = mysql+pymysql://{{ sahara_galera_user }}:{{ sahara_container_mysql_password }}@{{ sahara_galera_address }}/{{ sahara_galera_database }}?charset=utf8{% if sahara_galera_use_ssl | bool %}&ssl_verify_cert=true{% if sahara_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ sahara_galera_ssl_ca_cert }}{% endif %}{% endif %} [keystone_authtoken]