openstack
/
openstack-ansible-os_cloudkitty
Code Issues Proposed changes

Refactor galera_use_ssl behaviour 

With PKI role in place in most cases you don't need to explicitly
provide path to the CA file because PKI role ensures that CA is trusted
by the system overall. In the meanwhile in PyMySQL [1] you must either
provide CA file or cert/key or enable verify.

Since current behaviour is to provide path to the custom CA we expect
certificate being trusted overall. Thus we enable cert verification when
galera_use_ssl is True.

[1] 78f0cf99e5/pymysql/connections.py (L267)

Change-Id: I756a6cdaa4b619671da73c65761c796a0b2ade81
This commit is contained in:
Dmitriy Rabotyagov 2021-09-21 14:23:55 +03:00
parent 8445103c60
commit 319dadd643
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -97,8 +97,10 @@ cloudkitty_galera_address: "{{ galera_address | default('127.0.0.1') }}"
cloudkitty_galera_database: cloudkitty
cloudkitty_galera_user: cloudkitty
cloudkitty_galera_port: "{{ galera_port | default('3306') }}"
cloudkitty_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
cloudkitty_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}"
cloudkitty_database_connection: >-
mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_container_mysql_password }}@{{ cloudkitty_galera_address }}:{{ cloudkitty_galera_port }}/{{ cloudkitty_galera_database }}?charset=utf8
mysql+pymysql://{{ cloudkitty_galera_user }}:{{ cloudkitty_container_mysql_password }}@{{ cloudkitty_galera_address }}:{{ cloudkitty_galera_port }}/{{ cloudkitty_galera_database }}?charset=utf8{% if cloudkitty_galera_use_ssl | bool %}&ssl_verify_cert=true{% if cloudkitty_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ cloudkitty_galera_ssl_ca_cert }}{% endif %}{% endif %}
cloudkitty_wsgi_threads: 1
cloudkitty_wsgi_processes_max: 16