Add MySQL connection SSL support
When 'aodh_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: I24f06aeacd92d6eead4100009301e0fb975bc552 Partial-Bug: 1667789
This commit is contained in:
parent
ce871dee75
commit
9f8713e5c0
@ -49,12 +49,14 @@ aodh_system_shell: /bin/false
|
|||||||
aodh_system_comment: aodh system user
|
aodh_system_comment: aodh system user
|
||||||
aodh_system_user_home: "/var/lib/{{ aodh_system_user_name }}"
|
aodh_system_user_home: "/var/lib/{{ aodh_system_user_name }}"
|
||||||
|
|
||||||
## DB info
|
## Database info
|
||||||
aodh_database_name: aodh
|
aodh_database_name: aodh
|
||||||
aodh_database_user: aodh
|
aodh_database_user: aodh
|
||||||
aodh_db_type: "mysql+pymysql"
|
aodh_db_type: "mysql+pymysql"
|
||||||
aodh_db_address: localhost
|
aodh_db_address: localhost
|
||||||
aodh_connection_string: "{{ aodh_db_type }}://{{ aodh_database_user }}:{{ aodh_container_db_password }}@{{ aodh_db_address }}/{{ aodh_database_name }}?charset=utf8"
|
aodh_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
|
||||||
|
aodh_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}"
|
||||||
|
aodh_connection_string: "{{ aodh_db_type }}://{{ aodh_database_user }}:{{ aodh_container_db_password }}@{{ aodh_db_address }}/{{ aodh_database_name }}?charset=utf8{% if aodh_galera_use_ssl | bool %}&ssl_ca={{ aodh_galera_ssl_ca_cert }}{% endif %}"
|
||||||
|
|
||||||
## RabbitMQ info
|
## RabbitMQ info
|
||||||
aodh_rabbitmq_userid: aodh
|
aodh_rabbitmq_userid: aodh
|
||||||
|
11
tox.ini
11
tox.ini
@ -103,6 +103,17 @@ commands =
|
|||||||
bash -c "{toxinidir}/tests/common/test-ansible-functional.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]
|
[testenv:linters]
|
||||||
deps =
|
deps =
|
||||||
{[testenv:ansible]deps}
|
{[testenv:ansible]deps}
|
||||||
|
21
zuul.d/jobs.yaml
Normal file
21
zuul.d/jobs.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
# Copyright 2017, Rackspace US, Inc.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: openstack-ansible-aodh-ssl-nv
|
||||||
|
parent: openstack-ansible-functional-ubuntu-xenial
|
||||||
|
voting: false
|
||||||
|
vars:
|
||||||
|
tox_env: ssl
|
@ -21,6 +21,7 @@
|
|||||||
- openstack-ansible-functional-centos-7
|
- openstack-ansible-functional-centos-7
|
||||||
- openstack-ansible-functional-opensuse-423
|
- openstack-ansible-functional-opensuse-423
|
||||||
- openstack-ansible-functional-ubuntu-xenial
|
- openstack-ansible-functional-ubuntu-xenial
|
||||||
|
- openstack-ansible-aodh-ssl-nv
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-ansible-integrated-deploy-aio
|
- openstack-ansible-integrated-deploy-aio
|
||||||
@ -30,3 +31,4 @@
|
|||||||
- openstack-ansible-functional-centos-7
|
- openstack-ansible-functional-centos-7
|
||||||
- openstack-ansible-functional-opensuse-423
|
- openstack-ansible-functional-opensuse-423
|
||||||
- openstack-ansible-functional-ubuntu-xenial
|
- openstack-ansible-functional-ubuntu-xenial
|
||||||
|
- openstack-ansible-aodh-ssl-nv
|
||||||
|
Loading…
Reference in New Issue
Block a user