Andrew Bogott has submitted this change and it was merged. Change subject: Fix the args for designate-sink. ......................................................................
Fix the args for designate-sink. - Domain needs to be a designate domain ID, not just a name - Entry format used smart-quotes, which caused all kinds of bad behavior Change-Id: Id4351eb17df9fd56b7983123e7ac982406eb690b --- M modules/openstack/templates/icehouse/designate/designate.conf.erb 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/icehouse/designate/designate.conf.erb b/modules/openstack/templates/icehouse/designate/designate.conf.erb index 79cf106..305c767 100644 --- a/modules/openstack/templates/icehouse/designate/designate.conf.erb +++ b/modules/openstack/templates/icehouse/designate/designate.conf.erb @@ -197,12 +197,12 @@ # Nova Fixed Handler #----------------------- [handler:nova_fixed] -# Domain ID of domain to create records in. Should be pre-created -domain_id = <%= designateconfig["dhcp_domain"] %>.wmflabs +# Domain ID of domain to create records in. For a pre-existing domain, in this case eqiad.wmflabs +domain_id = '159d5d42-6848-4661-8524-8e571c4cfe31' notification_topics = monitor notification_topics = notifications control_exchange = nova -format = ā%(display_name)s.%(domain)sā +format = '%(hostname)s.%(tenant_id)s.%(domain)s' #------------------------ # Neutron Floating Handler -- To view, visit https://gerrit.wikimedia.org/r/197420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4351eb17df9fd56b7983123e7ac982406eb690b 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
