openstack
/
charm-keystone
Code Issues Proposed changes

Ensure service name is not None before lookup 

We need to ensure value for 'service' provided on
identity relation before doing valid_services lookup.

Change-Id: I42fb9dbb48b3bcf8fd40700db84ec8210b8433a4
Related-Bug: #1965967
(cherry picked from commit 9e8c0c9928)
(cherry picked from commit b5008adc50)
(cherry picked from commit 1f5322d738)
This commit is contained in:
Edward Hope-Morley 2022-04-04 14:39:26 +01:00
parent bcd99cd193
commit 73d7192ee0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/keystone_utils.py
View File

@ -1887,10 +1887,15 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
relation_data["admin_domain_id"] = leader_get(
attribute='admin_domain_id')
if 'service' in settings:
if settings.get('service') is not None:
svc_name = settings['service'].partition('_')[0]
relation_data['service_type'] = \
valid_services[svc_name]['type']
if svc_name in valid_services:
relation_data['service_type'] = \
valid_services[svc_name]['type']
else:
log("service '{}' not found in valid_services "
"catalog so unable to set service_type on relation".
format(svc_name), level=WARNING)
# Allow the remote service to request creation of any additional
# roles. Currently used by Horizon