diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-31 18:47:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-31 18:47:42 +0000 |
| commit | 66e69fb2c0fcd7347b22809c5d732773ef4e2ba4 (patch) | |
| tree | b658e797a7bf69234e0441f5af405e790509d38b | |
| parent | a02ddcb1784072d6204501ced6ccf575dfe231fb (diff) | |
| parent | 28554cbce362d9b3037b3f2afe82a1b159b0ffb5 (diff) | |
| download | designate-66e69fb2c0fcd7347b22809c5d732773ef4e2ba4.tar.gz | |
Merge "change from domain to zone at configfile"
| -rw-r--r-- | etc/designate/designate.conf.sample | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/etc/designate/designate.conf.sample b/etc/designate/designate.conf.sample index 26be269a..d21a2154 100644 --- a/etc/designate/designate.conf.sample +++ b/etc/designate/designate.conf.sample @@ -466,8 +466,8 @@ debug = False # Nova Fixed Handler #----------------------- [handler:nova_fixed] -# Domain ID of domain to create records in. Should be pre-created -#domain_id = +# Zone ID of zone to create records in. Should be pre-created +#zone_id = #notification_topics = notifications #control_exchange = 'nova' #"format" has been depricated. Instead we now have two formaters @@ -475,24 +475,24 @@ debug = False #"formatv4" has been defined for IPv4 addresses. #"formatv6" is for IPv6 addresses. # -#formatv4 = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s' -#formatv4 = '%(hostname)s.%(project)s.%(domain)s' -#formatv4 = '%(hostname)s.%(domain)s' -#formatv6 = '%(hostname)s.%(domain)s' -#formatv6 = '%(hostname)s.%(project)s.%(domain)s' +#formatv4 = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s' +#formatv4 = '%(hostname)s.%(project)s.%(zone)s' +#formatv4 = '%(hostname)s.%(zone)s' +#formatv6 = '%(hostname)s.%(zone)s' +#formatv6 = '%(hostname)s.%(project)s.%(zone)s' #------------------------ # Neutron Floating Handler #------------------------ [handler:neutron_floatingip] -# Domain ID of domain to create records in. Should be pre-created -#domain_id = +# Zone ID of zone to create records in. Should be pre-created +#zone_id = #notification_topics = notifications #control_exchange = 'neutron' -#formatv4 = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(domain)s' -#formatv4 = '%(hostname)s.%(project)s.%(domain)s' -#formatv4 = '%(hostname)s.%(domain)s' -#formatv6 = '%(hostname)s.%(project)s.%(domain)s' -#formatv6 = '%(hostname)s.%(domain)s' +#formatv4 = '%(octet0)s-%(octet1)s-%(octet2)s-%(octet3)s.%(zone)s' +#formatv4 = '%(hostname)s.%(project)s.%(zone)s' +#formatv4 = '%(hostname)s.%(zone)s' +#formatv6 = '%(hostname)s.%(project)s.%(zone)s' +#formatv6 = '%(hostname)s.%(zone)s' ############################## ## Agent Backend Configuration |