diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 6abd68bc7f..671b4b73d0 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -965,7 +965,8 @@ cloudkitty_storage_backend: "influxdb" ####################### # Valid options are [ bind9, infoblox ] designate_backend: "bind9" -designate_ns_record: "sample.openstack.org" +designate_ns_record: + - "ns1.example.org" designate_backend_external: "no" designate_backend_external_bind9_nameservers: "" # Valid options are [ '', redis ] diff --git a/ansible/roles/designate/templates/pools.yaml.j2 b/ansible/roles/designate/templates/pools.yaml.j2 index 2ee426e2b7..2ec767254d 100644 --- a/ansible/roles/designate/templates/pools.yaml.j2 +++ b/ansible/roles/designate/templates/pools.yaml.j2 @@ -4,8 +4,15 @@ description: Default BIND9 Pool attributes: {} ns_records: +{% if designate_ns_record is string %} - hostname: {{ designate_ns_record }}. priority: 1 +{% else %} +{% for host in designate_ns_record %} + - hostname: {{ host }}. + priority: 1 +{% endfor %} +{% endif %} nameservers: {% if designate_backend == 'bind9' %} {% for host in groups['designate-backend-bind9'] %} diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 443a53ad76..5b0ad347ea 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -68,7 +68,9 @@ router_distributed = True {% endif %} {% if enable_designate | bool %} +{% if designate_ns_record is string %} dns_domain = {{ designate_ns_record }}. +{% endif %} external_dns_driver = designate {% if neutron_plugin_agent == 'vmware_nsxv' %} nsx_extension_drivers = vmware_nsxv_dns diff --git a/doc/source/reference/networking/designate-guide.rst b/doc/source/reference/networking/designate-guide.rst index da427d2a20..8a21a04de6 100644 --- a/doc/source/reference/networking/designate-guide.rst +++ b/doc/source/reference/networking/designate-guide.rst @@ -35,7 +35,8 @@ Configure Designate options in ``/etc/kolla/globals.yml`` .. code-block:: yaml dns_interface: "eth1" - designate_ns_record: "sample.openstack.org" + designate_ns_record: + - "ns1.sample.openstack.org" .. important:: diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 104c771e24..dd66c24530 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -551,7 +551,8 @@ ################### # Valid options are [ bind9 ] #designate_backend: "bind9" -#designate_ns_record: "sample.openstack.org" +#designate_ns_record: +# - "ns1.example.org" # Valid options are [ '', redis ] #designate_coordination_backend: "{{ 'redis' if enable_redis|bool else '' }}"