diff --git a/defaults/main.yml b/defaults/main.yml index 91b1b4e..3005d96 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -118,7 +118,9 @@ trove_galera_database_name: trove trove_galera_user: trove trove_galera_address: "{{ internal_lb_vip_address }}" trove_db_sync_options: -trove_galera_connection_string: "mysql+pymysql://{{ trove_galera_user}}:{{ trove_galera_password }}@{{ trove_galera_address }}/{{ trove_galera_database_name }}?charset=utf8" +trove_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" +trove_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" +trove_galera_connection_string: "mysql+pymysql://{{ trove_galera_user}}:{{ trove_galera_password }}@{{ trove_galera_address }}/{{ trove_galera_database_name }}?charset=utf8{% if trove_galera_use_ssl | bool %}&ssl_ca={{ trove_galera_ssl_ca_cert }}{% endif %}" # Rabbit vars trove_control_exchange: trove diff --git a/tox.ini b/tox.ini index 8f68933..521eb87 100755 --- a/tox.ini +++ b/tox.ini @@ -103,6 +103,17 @@ commands = 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} diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml new file mode 100644 index 0000000..821afe5 --- /dev/null +++ b/zuul.d/jobs.yaml @@ -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-trove-ssl-nv + parent: openstack-ansible-functional-ubuntu-xenial + voting: false + vars: + tox_env: ssl diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 3dfe68c..9c391b0 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -20,6 +20,7 @@ - openstack-ansible-linters - openstack-ansible-functional-ubuntu-xenial - openstack-ansible-functional-centos-7 + - openstack-ansible-trove-ssl-nv experimental: jobs: - openstack-ansible-integrated-deploy-aio @@ -28,3 +29,4 @@ - openstack-ansible-linters - openstack-ansible-functional-ubuntu-xenial - openstack-ansible-functional-centos-7 + - openstack-ansible-trove-ssl-nv