Merge "Replace sdk user_reference module with profile"

This commit is contained in:
Jenkins 2015-05-25 08:33:37 +00:00 committed by Gerrit Code Review
commit b71f03e2cb
2 changed files with 5 additions and 5 deletions

View File

@ -16,8 +16,8 @@ SDK Client
from openstack import connection
from openstack import exceptions
from openstack import profile
from openstack import transport
from openstack import user_preference
from oslo_serialization import jsonutils
from requests import exceptions as reqexc
@ -189,12 +189,12 @@ def create_connection(ctx):
# 'verify': OS_CACERT, TLS certificate to verify remote server
}
pref = user_preference.UserPreference()
prof = profile.Profile()
if ctx.region_name:
pref.set_region(pref.ALL, ctx.region_name)
prof.set_region(prof.ALL, ctx.region_name)
try:
conn = connection.Connection(preference=pref, user_agent=USER_AGENT,
conn = connection.Connection(profile=prof, user_agent=USER_AGENT,
**kwargs)
except exceptions.HttpException as ex:
raise ex

View File

@ -177,7 +177,7 @@ def initialize():
mgr = extension.ExtensionManager(
namespace=namespace,
invoke_on_load=False,
verify_requirements=True)
verify_requirements=False)
return [[name, mgr[name].plugin] for name in mgr.names()]
if _environment is not None: