From e604d87665f15b68a3d1b19bb65f8d4acd91e6c0 Mon Sep 17 00:00:00 2001 From: Sarafraj Singh Date: Mon, 19 Dec 2016 16:26:45 -0600 Subject: [PATCH] Adopts keystoneauth with glance client. Migrate Glance client to Keystonesuth to make it consistent with Cinder and Neutron clients. Note: We still use the api_servers variable, rather than fetching endpoints from the service catalog. This change is needed to enable the use of service token with Glance client. Related to blueprint use-service-tokens-pike Change-Id: I02be31bbe2de54c69210934b234ed380daca4fda Co-Authored-By: Pushkar Umaranikar --- nova/conf/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/nova/conf/__init__.py b/nova/conf/__init__.py index 022927db8..f0bd45d81 100644 --- a/nova/conf/__init__.py +++ b/nova/conf/__init__.py @@ -60,7 +60,6 @@ from nova.conf import service from nova.conf import service_token from nova.conf import servicegroup from nova.conf import spice -from nova.conf import ssl from nova.conf import upgrade_levels from nova.conf import vendordata from nova.conf import vmware @@ -112,7 +111,6 @@ service.register_opts(CONF) service_token.register_opts(CONF) servicegroup.register_opts(CONF) spice.register_opts(CONF) -ssl.register_opts(CONF) upgrade_levels.register_opts(CONF) vendordata.register_opts(CONF) vmware.register_opts(CONF)