From 83d04b615a269a12b9dbf5ce175441b19bb9a041 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 15 Mar 2012 12:06:34 +0100 Subject: [PATCH] Remove OPENSTACK_KEYSTONE_ADMIN_URL This is not needed anymore, since the catalog is now used. Change-Id: I9dca3c91b6f50f5f15ec334f5a124ca08b9e4194 Signed-off-by: Julien Danjou --- horizon/tests/testsettings.py | 1 - openstack_dashboard/local/local_settings.py.example | 3 --- 2 files changed, 4 deletions(-) diff --git a/horizon/tests/testsettings.py b/horizon/tests/testsettings.py index cbf7d1c9e..e772e87d0 100644 --- a/horizon/tests/testsettings.py +++ b/horizon/tests/testsettings.py @@ -103,7 +103,6 @@ AVAILABLE_REGIONS = [ OPENSTACK_ADDRESS = "localhost" OPENSTACK_ADMIN_TOKEN = "openstack" OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_ADDRESS -OPENSTACK_KEYSTONE_ADMIN_URL = "http://%s:35357/v2.0" % OPENSTACK_ADDRESS OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member" OPENSTACK_KEYSTONE_BACKEND = { diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index a092f09c1..e6194434c 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -44,9 +44,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' OPENSTACK_HOST = "127.0.0.1" OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST -# FIXME: this is only needed until keystone fixes its GET /tenants call -# so that it doesn't return everything for admins -OPENSTACK_KEYSTONE_ADMIN_URL = "http://%s:35357/v2.0" % OPENSTACK_HOST OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member" # The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the