diff --git a/requires.py b/requires.py index 2130917..a3ac61a 100644 --- a/requires.py +++ b/requires.py @@ -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(), diff --git a/unit_tests/test_requires.py b/unit_tests/test_requires.py index 6301279..2dd73bb 100644 --- a/unit_tests/test_requires.py +++ b/unit_tests/test_requires.py @@ -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