Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/327035 )
Change subject: Designate: fix a copy/paste error in secondary pool_target ...................................................................... Designate: fix a copy/paste error in secondary pool_target I'm pretty sure this was of no consequence, but also pretty sure it was wrong before. Change-Id: I86edf5a0b4cfef126252e73068a8d25cd8a353f4 --- M modules/openstack/templates/liberty/designate/designate.conf.erb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/liberty/designate/designate.conf.erb b/modules/openstack/templates/liberty/designate/designate.conf.erb index fcf3a8d..9aaa65c 100644 --- a/modules/openstack/templates/liberty/designate/designate.conf.erb +++ b/modules/openstack/templates/liberty/designate/designate.conf.erb @@ -228,10 +228,10 @@ <% if @secondary_pdns_ip != @primary_pdns_ip %> # the 'pool_target' is the pdns database, which we write to for zone creation and deletion [pool_target:f845cc43-2052-4d4b-a159-db6fce37b110] -options = connection: mysql://<%= @designateconfig["pdns_db_user"] %>:<%= @designateconfig["pdns_db_pass"] %>@<%=@secondary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host: <%= @primary_pdns_ip %>, port: 53 +options = connection: mysql://<%= @designateconfig["pdns_db_user"] %>:<%= @designateconfig["pdns_db_pass"] %>@<%=@secondary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host: <%= @secondary_pdns_ip %>, port: 53 # This is an alternate db account with more rights -- this setting should # be used when running the db-sync command and the like during upgrades. -#options = connection: mysql://<%= @designateconfig["db_admin_user"] %>:<%= @designateconfig["db_admin_pass"] %>@<%=@secondary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host: <%= @primary_pdns_ip %>, port: 53 +#options = connection: mysql://<%= @designateconfig["db_admin_user"] %>:<%= @designateconfig["db_admin_pass"] %>@<%=@secondary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host: <%= @secondary_pdns_ip %>, port: 53 # This is a comma separated list of the mdns servers. # Note that for this to take effect, the list of masters must also be set in the pdns database: # UPDATE pdns.domains SET master="<comman-separated list of masters>" -- To view, visit https://gerrit.wikimedia.org/r/327035 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86edf5a0b4cfef126252e73068a8d25cd8a353f4 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
