openstack
/
charm-interface-keystone
Code Issues Proposed changes

Add service_type auto_accessors and base settings 

The service_type needs to be added to keystone_authtoken
for access rules (application credentials) to work so it
is now a required parameter.

Related-Bug: #1965967
Change-Id: Ic90de9de13ad2728b9ce9de075c03f7854c417ca
This commit is contained in:
Edward Hope-Morley 2022-03-26 16:30:11 +00:00
parent a4684ff27a
commit 83b6b1e092
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requires.py
View File

@ -34,7 +34,8 @@ class KeystoneRequires(RelationBase):
'ssl_cert_public', 'ssl_key_admin', 'ssl_key_internal',
'ssl_key_public', 'api_version', 'service_domain',
'service_domain_id', 'ep_changed',
'admin_domain_id', 'admin_user_id', 'admin_project_id']
'admin_domain_id', 'admin_user_id', 'admin_project_id',
'service_type']
@hook('{requires:keystone}-relation-joined')
def joined(self):
@ -76,6 +77,7 @@ class KeystoneRequires(RelationBase):
'auth_host': self.auth_host(),
'auth_protocol': self.auth_protocol(),
'auth_port': self.auth_port(),
'service_type': self.service_type(),
'service_tenant': self.service_tenant(),
'service_username': self.service_username(),
'service_password': self.service_password(),

1
unit_tests/test_requires.py
View File

@ -119,6 +119,7 @@ class TestKeystoneRequires(unittest.TestCase):
self.patch_kr('service_username', '2')
self.patch_kr('service_password', '3')
self.patch_kr('service_tenant_id', '4')
self.patch_kr('service_type', 'identity')
assert self.kr.base_data_complete() is True
self.service_tenant.return_value = None
assert self.kr.base_data_complete() is False