openstack/charm-keystone
Code Issues Proposed changes

Merge "Exposing internal url over the relation."

Browse Source
This commit is contained in:
Zuul
2021-03-16 14:58:05 +00:00
committed by Gerrit Code Review
parent 2e8d6abcef 1e6d8e004b
commit b0ea402ec0
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/keystone_utils.py
View File

@@ -1852,11 +1852,19 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
# Check if clustered and use vip + haproxy ports if so # Check if clustered and use vip + haproxy ports if so
relation_data["auth_host"] = resolve_address(ADMIN) relation_data["auth_host"] = resolve_address(ADMIN)
relation_data["service_host"] = resolve_address(PUBLIC) relation_data["service_host"] = resolve_address(PUBLIC)
relation_data["internal_host"] = resolve_address(INTERNAL)
relation_data["auth_protocol"] = protocol relation_data["auth_protocol"] = protocol
relation_data["service_protocol"] = protocol relation_data["service_protocol"] = protocol
relation_data["internal_protocol"] = protocol
relation_data["auth_port"] = config('admin-port') relation_data["auth_port"] = config('admin-port')
relation_data["service_port"] = config('service-port') relation_data["service_port"] = config('service-port')
# the internal url is binded to the service-port when
# bootstrapping keystone in the function bootstrap_keystone(), the
# same config is handed over in the relation.
relation_data["internal_port"] = config('service-port')
relation_data["region"] = config('region') relation_data["region"] = config('region')
relation_data["api_version"] = get_api_version() relation_data["api_version"] = get_api_version()
relation_data["admin_domain_id"] = leader_get( relation_data["admin_domain_id"] = leader_get(
@@ -1967,7 +1975,9 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
relation_data = { relation_data = {
"auth_host": resolve_address(ADMIN), "auth_host": resolve_address(ADMIN),
"service_host": resolve_address(PUBLIC), "service_host": resolve_address(PUBLIC),
"internal_host": resolve_address(INTERNAL),
"service_port": config("service-port"), "service_port": config("service-port"),
"internal_port": config("service-port"),
"auth_port": config("admin-port"), "auth_port": config("admin-port"),
"service_username": service_username, "service_username": service_username,
"service_password": service_password, "service_password": service_password,
@@ -1981,6 +1991,7 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
"ca_cert": '__null__', "ca_cert": '__null__',
"auth_protocol": protocol, "auth_protocol": protocol,
"service_protocol": protocol, "service_protocol": protocol,
"internal_protocol": protocol,
"api_version": get_api_version(), "api_version": get_api_version(),
"admin_domain_id": leader_get(attribute='admin_domain_id'), "admin_domain_id": leader_get(attribute='admin_domain_id'),
"admin_project_id": admin_project_id, "admin_project_id": admin_project_id,

6
unit_tests/test_keystone_utils.py
View File

@@ -359,6 +359,9 @@ class TestKeystoneUtils(CharmTestCase):
'auth_port': 80, 'auth_port': 80,
'auth_protocol': 'https', 'auth_protocol': 'https',
'service_port': 81, 'service_port': 81,
'internal_host': '10.10.10.10',
'internal_protocol': 'https',
'internal_port': 81,
'region': 'RegionOne', 'region': 'RegionOne',
'api_version': 2, 'api_version': 2,
'admin_domain_id': None, 'admin_domain_id': None,
@@ -447,6 +450,9 @@ class TestKeystoneUtils(CharmTestCase):
'auth_host': '10.0.0.3', 'auth_host': '10.0.0.3',
'service_host': '10.0.0.3', 'service_host': '10.0.0.3',
'service_port': 81, 'auth_port': 80, 'service_port': 81, 'auth_port': 80,
'internal_host': '10.0.0.3',
'internal_protocol': 'http',
'internal_port': 81,
'service_username': 'keystone', 'service_username': 'keystone',
'service_password': 'password', 'service_password': 'password',
'service_domain': service_domain, 'service_domain': service_domain,