Add MySQL connection SSL support
When 'neutron_galera_use_ssl' is True, use an encrypted connection to the database using either a self-signed or user-provided CA certificate. A new non-voting test has been added to verify that the role remains functional when enabling SSL features. Change-Id: Id576553bd481ed786ff0ed4948ce79bb74544000 Partial-Bug: 1667789
This commit is contained in:
parent
b13fc04a5b
commit
7dce3277b0
|
@ -179,6 +179,8 @@ neutron_galera_database: neutron
|
|||
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') }}"
|
||||
|
||||
###
|
||||
### RPC (RabbitMQ) integration
|
||||
|
|
|
@ -187,7 +187,8 @@ memcache_secret_key = {{ memcached_encryption_key }}
|
|||
|
||||
# Database
|
||||
[database]
|
||||
connection = mysql+pymysql://{{ neutron_galera_user }}:{{ neutron_container_mysql_password }}@{{ neutron_galera_address }}/{{ neutron_galera_database }}?charset=utf8
|
||||
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 %}
|
||||
|
||||
max_overflow = {{ neutron_db_max_overflow }}
|
||||
max_pool_size = {{ neutron_db_pool_size }}
|
||||
pool_timeout = {{ neutron_db_pool_timeout }}
|
||||
|
|
12
tox.ini
12
tox.ini
|
@ -170,6 +170,18 @@ commands =
|
|||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
|
||||
[testenv:ssl]
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
setenv =
|
||||
{[testenv]setenv}
|
||||
ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
|
||||
commands =
|
||||
bash -c "{toxinidir}/tests/tests-repo-clone.sh"
|
||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
|
||||
|
||||
|
||||
[testenv:linters]
|
||||
deps =
|
||||
{[testenv:ansible]deps}
|
||||
|
|
|
@ -47,3 +47,10 @@
|
|||
voting: false
|
||||
vars:
|
||||
tox_env: ovs-nsh
|
||||
|
||||
- job:
|
||||
name: openstack-ansible-neutron-ssl-nv
|
||||
parent: openstack-ansible-functional-ubuntu-xenial
|
||||
voting: false
|
||||
vars:
|
||||
tox_env: ssl
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
- openstack-ansible-dragonflow-ubuntu-xenial-nv
|
||||
- openstack-ansible-opendaylight-ubuntu-xenial-nv
|
||||
- openstack-ansible-ovs-nsh-ubuntu-xenial
|
||||
- openstack-ansible-neutron-ssl-nv
|
||||
experimental:
|
||||
jobs:
|
||||
- openstack-ansible-integrated-deploy-aio
|
||||
|
@ -37,4 +38,4 @@
|
|||
- openstack-ansible-functional-opensuse-423
|
||||
- openstack-ansible-functional-ubuntu-xenial
|
||||
- openstack-ansible-upgrade-ubuntu-xenial
|
||||
|
||||
- openstack-ansible-neutron-ssl-nv
|
||||
|
|
Loading…
Reference in New Issue