diff --git a/defaults/main.yml b/defaults/main.yml index 5fc5b32..cd1ec39 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -57,10 +57,12 @@ designate_system_shell: /bin/false designate_system_comment: designate system user designate_system_user_home: "/var/lib/{{ designate_system_user_name }}" -## DB info +## Database info designate_galera_address: 127.0.0.1 designate_galera_user: designate designate_galera_database: designate +designate_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" +designate_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/galera-ca.pem') }}" ## RabbitMQ info designate_rabbitmq_userid: designate diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index a7b1714..0e1dd21 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -388,7 +388,8 @@ endpoint_type = internalURL # SQLAlchemy Storage #----------------------- [storage:sqlalchemy] -connection = mysql+pymysql://{{ designate_galera_user }}:{{ designate_galera_password }}@{{ designate_galera_address }}/designate?charset=utf8 +connection = mysql+pymysql://{{ designate_galera_user }}:{{ designate_galera_password }}@{{ designate_galera_address }}/designate?charset=utf8{% if designate_galera_use_ssl | bool %}&ssl_ca={{ designate_galera_ssl_ca_cert }}{% endif %} + #connection_debug = 0 #connection_trace = False #sqlite_synchronous = True diff --git a/tox.ini b/tox.ini index 7205288..9ce3d05 100644 --- 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..13ce412 --- /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-designate-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 6168f4e..1fdf291 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -21,6 +21,7 @@ - openstack-ansible-functional-centos-7 - openstack-ansible-functional-opensuse-423 - openstack-ansible-functional-ubuntu-xenial + - openstack-ansible-designate-ssl-nv experimental: jobs: - openstack-ansible-integrated-deploy-aio @@ -30,3 +31,4 @@ - openstack-ansible-functional-centos-7 - openstack-ansible-functional-opensuse-423 - openstack-ansible-functional-ubuntu-xenial + - openstack-ansible-designate-ssl-nv