Andrew Bogott has submitted this change and it was merged. Change subject: Formatting followup for I32b30fccaf044ae2865b331f28f9238ac6693f81 ......................................................................
Formatting followup for I32b30fccaf044ae2865b331f28f9238ac6693f81 Change-Id: Ia148d8dfc2689a2dc2adaaa8faa61eb1972a2d58 --- M modules/openstack/templates/liberty/designate/designate.conf.erb 1 file changed, 4 insertions(+), 4 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 4897535..347f34c 100644 --- a/modules/openstack/templates/liberty/designate/designate.conf.erb +++ b/modules/openstack/templates/liberty/designate/designate.conf.erb @@ -206,10 +206,10 @@ # the 'pool_target' is the pdns database, which we write to for zone creation and deletion [pool_target:f26e0b32-736f-4f0a-831b-039a415c481e] -options = connection: mysql://<%= @designateconfig["pdns_db_user"] %>:<%= @designateconfig["pdns_db_pass"] %>@<%=@primary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host = <%= @primary_pdns_ip %>, port = 53 +options = connection: mysql://<%= @designateconfig["pdns_db_user"] %>:<%= @designateconfig["pdns_db_pass"] %>@<%=@primary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host: <%= @primary_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"] %>@<%=@primary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host = <%= @primary_pdns_ip %>, port = 53 +#options = connection: mysql://<%= @designateconfig["db_admin_user"] %>:<%= @designateconfig["db_admin_pass"] %>@<%=@primary_pdns_ip%>/<%= @designateconfig["pdns_db_name"] %>, host: <%= @primary_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>" @@ -222,10 +222,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: <%= @primary_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: <%= @primary_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/300562 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia148d8dfc2689a2dc2adaaa8faa61eb1972a2d58 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
