Fix bug introduced by openstacksdk

This patch sets the default auth_plugin to 'password', it also removes
the authenticator reference from client module. These code are breaking
the client code.

Change-Id: I7f815d3847b0bd0f5e6c3f78c2cc0efd3c80a523
This commit is contained in:
tengqm
2015-11-23 22:52:45 -05:00
parent c2f78e6021
commit 0e1e4857f6
3 changed files with 3 additions and 5 deletions

View File

@@ -123,10 +123,9 @@ class Resource(base.Resource):
return self
def create_connection(preferences=None, user_agent=None, **kwargs):
def create_connection(prof=None, user_agent=None, **kwargs):
try:
conn = connection.Connection(profile=preferences,
user_agent=user_agent,
conn = connection.Connection(profile=prof, user_agent=user_agent,
**kwargs)
except exceptions.HttpException as ex:
exc.parse_exception(ex.details)

View File

@@ -216,7 +216,7 @@ class SenlinShell(object):
def _setup_senlin_client(self, api_ver, args):
'''Create senlin client using given args.'''
kwargs = {
'auth_plugin': args.auth_plugin,
'auth_plugin': args.auth_plugin or 'password',
'auth_url': args.auth_url,
'project_name': args.project_name or args.tenant_name,
'project_id': args.project_id or args.tenant_id,

View File

@@ -28,7 +28,6 @@ class Client(object):
session = conn.session
self.session = session
self.auth = session.authenticator
######################################################################
# The following operations are interfaces exposed to other software