Andrew Bogott has submitted this change and it was merged. Change subject: Sync designate.conf between kilo and liberty ......................................................................
Sync designate.conf between kilo and liberty Change-Id: I32e52a504936e7989712d96d8d4a438151c0ca3b --- M modules/openstack/templates/kilo/designate/designate.conf.erb M modules/openstack/templates/liberty/designate/designate.conf.erb 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb b/modules/openstack/templates/kilo/designate/designate.conf.erb index aaace97..8d04ba3 100644 --- a/modules/openstack/templates/kilo/designate/designate.conf.erb +++ b/modules/openstack/templates/kilo/designate/designate.conf.erb @@ -156,6 +156,7 @@ [pool:794ccc2c-d751-44fe-b57f-8894c9f5c842] nameservers = 0f66b842-96c2-4189-93fc-1dc95a08b012, 17474d59-a989-48fb-9f8b-19fbdaeff243 targets = f26e0b32-736f-4f0a-831b-039a415c481e +also_notifies = <%= @secondary_pdns_ip %>:53 # A 'pool_nameserver' is a pdns instance that receives axfr updates. # This is the primary dns server, currently 'labservices1001' @@ -182,6 +183,8 @@ # UPDATE pdns.domains SET master="<comman-separated list of masters>" masters = <%= scope.function_ipresolve([@fqdn, 4]) %>:5354 type = powerdns +host = <%= @primary_pdns_ip %> +port = 53 ############## ## Network API diff --git a/modules/openstack/templates/liberty/designate/designate.conf.erb b/modules/openstack/templates/liberty/designate/designate.conf.erb index 879c541..c1bed8d 100644 --- a/modules/openstack/templates/liberty/designate/designate.conf.erb +++ b/modules/openstack/templates/liberty/designate/designate.conf.erb @@ -78,8 +78,8 @@ # Enable Version 1 API enable_api_v1 = True -# Enable Version 2 API (experimental) -enable_api_v2 = False +# Enable Version 2 API +enable_api_v2 = True enable_host_header = True -- To view, visit https://gerrit.wikimedia.org/r/277342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32e52a504936e7989712d96d8d4a438151c0ca3b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
