Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/255466
Change subject: Openstack: Removed redundant admin_token settings in a couple of places. ...................................................................... Openstack: Removed redundant admin_token settings in a couple of places. I don't see how these can have been doing anything; testing suggests they weren't. Change-Id: I2d17b342b171ce30e3cb8c5782621e4be3b50bd4 --- M modules/openstack/templates/kilo/designate/designate.conf.erb M modules/openstack/templates/kilo/glance/glance-api.conf.erb 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/255466/1 diff --git a/modules/openstack/templates/kilo/designate/designate.conf.erb b/modules/openstack/templates/kilo/designate/designate.conf.erb index 1a37051..b57efd3 100644 --- a/modules/openstack/templates/kilo/designate/designate.conf.erb +++ b/modules/openstack/templates/kilo/designate/designate.conf.erb @@ -103,7 +103,6 @@ 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"] %> diff --git a/modules/openstack/templates/kilo/glance/glance-api.conf.erb b/modules/openstack/templates/kilo/glance/glance-api.conf.erb index b1e397d..c3c6faf 100644 --- a/modules/openstack/templates/kilo/glance/glance-api.conf.erb +++ b/modules/openstack/templates/kilo/glance/glance-api.conf.erb @@ -284,7 +284,6 @@ service_host = <%= @glanceconfig["keystone_auth_host"] %> service_port = 5000 identity_uri = <%= @glanceconfig["keystone_auth_protocol"] %>://<%= @glanceconfig["keystone_auth_host"] %>:<%= @glanceconfig["keystone_auth_port"] %> -admin_token = ADMIN admin_token = <%= @glanceconfig["keystone_admin_token"] %> auth_uri = <%= @glanceconfig["auth_uri"] %>/v2.0 -- To view, visit https://gerrit.wikimedia.org/r/255466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d17b342b171ce30e3cb8c5782621e4be3b50bd4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
