Andrew Bogott has submitted this change and it was merged. Change subject: Leave designate config with icehouse settings. ......................................................................
Leave designate config with icehouse settings. This is weird -- I want the Juno cloud-archive for holmium so I can run the latest python-amqp. But, because there is no actual Juno release for designate in the cloud archive (or anywhere) we're still running designate Icehouse here. Icehouse is working fine, and this will all shake out in Kilo which is supported by the cloud archive. Bug: T104587 Change-Id: Ibaf3e58cc483d538d0692667d4e65424ab6cbdec --- M modules/openstack/templates/juno/designate/designate.conf.erb 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/juno/designate/designate.conf.erb b/modules/openstack/templates/juno/designate/designate.conf.erb index affe7a7..c4431dc 100644 --- a/modules/openstack/templates/juno/designate/designate.conf.erb +++ b/modules/openstack/templates/juno/designate/designate.conf.erb @@ -107,7 +107,9 @@ # Keystone Middleware #----------------------- [keystone_authtoken] -identity_uri = <%= @designateconfig["keystone_auth_protocol"] %>://<%= @designateconfig["keystone_auth_host"] %>:<%= @designateconfig["keystone_auth_port"] %> +auth_host = <%= @designateconfig["keystone_auth_host"] %> +auth_port = <%= @designateconfig["keystone_auth_port"] %> +auth_protocol = <%= @designateconfig["keystone_auth_protocol"] %> admin_token = ADMIN admin_token = <%= @designateconfig["keystone_admin_token"] %> auth_uri = <%= @designateconfig["auth_uri"] %> -- To view, visit https://gerrit.wikimedia.org/r/234047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibaf3e58cc483d538d0692667d4e65424ab6cbdec Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Rush <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
