openstack/tripleo-common
Code Issues Proposed changes

Add get_session function to base action class

Browse Source 
This removes some duplication and can be reused in a future patch
switching the ansible action to use the TripleoInventory class.

Change-Id: I5278ec75c2ff714c148901f723fb6ef5e1327f49
This commit is contained in:
Steven Hardy 2018-01-04 11:20:25 +00:00
parent 49d881a097
commit 785c9c0dae
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tripleo_common/actions/base.py
View File

@ -35,22 +35,24 @@ class TripleOAction(actions.Action):
def __init__(self): def __init__(self):
super(TripleOAction, self).__init__() super(TripleOAction, self).__init__()
def get_session(self, context, service_name):
session_and_auth = keystone_utils.get_session_and_auth(
context,
service_name=service_name
)
return session_and_auth['session']
def get_object_client(self, context): def get_object_client(self, context):
swift_endpoint = keystone_utils.get_endpoint_for_project( swift_endpoint = keystone_utils.get_endpoint_for_project(
context, context,
'swift' 'swift'
) )
session_and_auth = keystone_utils.get_session_and_auth(
context,
service_name='swift'
)
kwargs = { kwargs = {
'preauthurl': swift_endpoint.url % { 'preauthurl': swift_endpoint.url % {
'tenant_id': context.project_id 'tenant_id': context.project_id
}, },
'session': session_and_auth['session'], 'session': self.get_session(context, 'swift'),
'insecure': context.insecure, 'insecure': context.insecure,
'retries': 10, 'retries': 10,
'starting_backoff': 3, 'starting_backoff': 3,
@ -120,11 +122,6 @@ class TripleOAction(actions.Action):
zaqar_endpoint = keystone_utils.get_endpoint_for_project( zaqar_endpoint = keystone_utils.get_endpoint_for_project(
context, service_type='messaging') context, service_type='messaging')
session_and_auth = keystone_utils.get_session_and_auth(
context,
service_type='messaging'
)
auth_uri = context.security.auth_uri or \ auth_uri = context.security.auth_uri or \
keystone_utils.CONF.keystone_authtoken.auth_uri keystone_utils.CONF.keystone_authtoken.auth_uri
@ -135,7 +132,8 @@ class TripleOAction(actions.Action):
'insecure': context.security.insecure, 'insecure': context.security.insecure,
} }
auth_opts = {'backend': 'keystone', 'options': opts, } auth_opts = {'backend': 'keystone', 'options': opts, }
conf = {'auth_opts': auth_opts, 'session': session_and_auth['session']} conf = {'auth_opts': auth_opts,
'session': self.get_session(context, 'zaqar')}
return zaqarclient.Client(zaqar_endpoint.url, conf=conf) return zaqarclient.Client(zaqar_endpoint.url, conf=conf)