x/cloudpulse
Code Issues Proposed changes

Fixing Keystone to use auth_url for version discovery

Browse Source 
Change-Id: I9935a5070d9c1a11eede88538015c94dcdb49186
This commit is contained in:
Anand Shanmugam 2016-10-18 04:41:03 -07:00
parent 6237884f36
commit e96e57cbdd
1 changed files with 51 additions and 51 deletions

102
cloudpulse/openstack/api/keystone_session.py

@ -1,51 +1,51 @@
# Copyright 2015 Rackspace # Copyright 2015 Rackspace
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain # not use this file except in compliance with the License. You may obtain
# a copy of the License at # a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from keystoneauth1.identity import v2 as v2_client from keystoneauth1.identity import v2 as v2_client
from keystoneauth1.identity import v3 as v3_client from keystoneauth1.identity import v3 as v3_client
from keystoneauth1 import session from keystoneauth1 import session
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
cfg.CONF.import_group('keystone_authtoken', 'keystonemiddleware.auth_token') cfg.CONF.import_group('keystone_authtoken', 'keystonemiddleware.auth_token')
def _get_kssession(): def _get_kssession():
kwargs = {'auth_url': cfg.CONF.keystone_authtoken.auth_uri, kwargs = {'auth_url': cfg.CONF.keystone_authtoken.auth_uri,
'username': cfg.CONF.keystone_authtoken.username, 'username': cfg.CONF.keystone_authtoken.username,
'password': cfg.CONF.keystone_authtoken.password} 'password': cfg.CONF.keystone_authtoken.password}
if cfg.CONF.keystone_authtoken.auth_version == '2': if cfg.CONF.keystone_authtoken.auth_uri[-3:] == '2.0':
client = v2_client client = v2_client
kwargs['tenant_name'] = cfg.CONF.keystone_authtoken.project_name kwargs['tenant_name'] = cfg.CONF.keystone_authtoken.project_name
elif cfg.CONF.keystone_authtoken.auth_version == '3': elif cfg.CONF.keystone_authtoken.auth_uri[-1:] == '3':
client = v3_client client = v3_client
kwargs['project_name'] = cfg.CONF.keystone_authtoken.project_name kwargs['project_name'] = cfg.CONF.keystone_authtoken.project_name
kwargs['user_domain_id'] = cfg.CONF.keystone_authtoken.user_domain_id kwargs['user_domain_id'] = cfg.CONF.keystone_authtoken.user_domain_id
kwargs[ kwargs[
'project_domain_id'] = (cfg.CONF.keystone_authtoken. 'project_domain_id'] = (cfg.CONF.keystone_authtoken.
project_domain_id) project_domain_id)
else: else:
raise Exception('Unknown keystone version!') raise Exception('Unknown keystone version!')
try: try:
kc = client.Password(**kwargs) kc = client.Password(**kwargs)
kssession = session.Session( kssession = session.Session(
auth=kc, verify=(cfg.CONF.keystone_authtoken.cafile)) auth=kc, verify=(cfg.CONF.keystone_authtoken.cafile))
return kssession return kssession
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.exception("Error creating Keystone session.") LOG.exception("Error creating Keystone session.")