use format{v4,v6} options for Newton+

format option was removed in Pike but added in Newton - we need an
appropriate template for that while preserving Mitaka compatibility
https://docs.openstack.org/releasenotes/designate/pike.html#critical-issues

Change-Id: Ib5cb4bd79aba6ca37b21b8f0942bb09f9341d328
Closes-Bug: #1733079
This commit is contained in:
Dmitrii Shcherbakov 2017-11-18 17:48:28 +03:00 committed by James Page
parent 1879b16ea5
commit edab27eaf2
3 changed files with 24 additions and 1 deletions

View File

@ -34,10 +34,18 @@ options:
type: string
default: '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s'
description: Format of floating IP global records.
neutron-record-formatv6:
type: string
default: '%(hostname)s.%(tenant_id)s.%(zone)s'
description: Format of floating IPv6 global records.
nova-record-format:
type: string
default: '%(hostname)s.%(tenant_id)s.%(zone)s'
description: Format of floating IP global records.
description: Format of instance IPv4 global records.
nova-record-formatv6:
type: string
default: '%(hostname)s.%(tenant_id)s.%(zone)s'
description: Format of floating IPv6 global records.
enable-host-header:
type: boolean
default: false

View File

@ -0,0 +1,8 @@
{% if options.neutron_domain_id %}
[handler:neutron_floatingip]
zone_id = {{ options.neutron_domain_id }}
notification_topics = notifications_designate
control_exchange = 'neutron'
formatv4 = '{{ options.neutron_record_format }}'
formatv6 = '{{ options.neutron_record_formatv6 }}'
{% endif %}

View File

@ -0,0 +1,7 @@
{% if options.nova_domain_id %}
[handler:nova_fixed]
zone_id = {{ options.nova_domain_id }}
control_exchange = 'nova'
formatv4 = '{{ options.nova_record_format }}'
formatv6 = '{{ options.nova_record_formatv6 }}'
{% endif %}