openstack/karbor
Code Issues Proposed changes

Merge "Fix the error about the CA certificate parameters for Keystone clients"

Browse Source
This commit is contained in:
Jenkins 2016-11-16 06:39:00 +00:00 committed by Gerrit Code Review
commit 166e14ed9b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
karbor/common/karbor_keystone_plugin.py
View File

@ -126,9 +126,8 @@ class KarborKeystonePlugin(object):
auth_plugin = self._get_karbor_auth_plugin(trust_id)
cafile = cfg.CONF.keystone_authtoken.cafile
return keystone_session.Session(
auth=auth_plugin, cert=cafile, verify=False if
CONF.keystone_authtoken.insecure else
(CONF.keystone_authtoken.cafile or True))
auth=auth_plugin, verify=False if
CONF.keystone_authtoken.insecure else cafile)
def _get_service_user(self, user_name, user_domain_id):
try:
@ -158,9 +157,8 @@ class KarborKeystonePlugin(object):
cafile = cfg.CONF.keystone_authtoken.cafile
try:
l_session = keystone_session.Session(
auth=auth_plugin, cert=cafile, verify=False if
CONF.keystone_authtoken.insecure else
(CONF.keystone_authtoken.cafile or True))
auth=auth_plugin, verify=False if
CONF.keystone_authtoken.insecure else cafile)
return kc_v3.Client(session=l_session)
except Exception:
msg = ('create keystone client failed.cafile:(%s)' % cafile)