openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Fix placement endpoint check when endpoints are not set" into stable/victoria

This commit is contained in:
Zuul 2021-02-04 21:26:47 +00:00 committed by Gerrit Code Review
parent 0be9ee9822 3b3c9fc0fb
commit 03827d9d18
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/tests/utils/test_plan.py
View File

@ -741,7 +741,7 @@ class PlanTest(base.TestCase):
} }
mock_resource = mock.MagicMock() mock_resource = mock.MagicMock()
mock_resource.attributes = { mock_resource.attributes = {
'endpoint_map': {}, 'endpoint_map': None,
'value': None 'value': None
} }
mock_orchestration.resources.get.return_value = mock_resource mock_orchestration.resources.get.return_value = mock_resource

7
tripleo_common/utils/plan.py
View File

@ -418,16 +418,17 @@ def generate_passwords(swift, heat, mistral=None,
except heat_exc.HTTPNotFound: except heat_exc.HTTPNotFound:
stack_env = None stack_env = None
placement_extracted = False
try: try:
# We can't rely on the existence of PlacementPassword to # We can't rely on the existence of PlacementPassword to
# determine if placement extraction has occured as it was added # determine if placement extraction has occured as it was added
# in stein while the service extraction was delayed to train. # in stein while the service extraction was delayed to train.
# Inspect the endpoint map instead. # Inspect the endpoint map instead.
endpoint_res = heat.resources.get(container, 'EndpointMap') endpoint_res = heat.resources.get(container, 'EndpointMap')
endpoints = endpoint_res.attributes.get('endpoint_map', {}) endpoints = endpoint_res.attributes.get('endpoint_map', None)
placement_extracted = 'PlacementPublic' in endpoints placement_extracted = endpoints and 'PlacementPublic' in endpoints
except heat_exc.HTTPNotFound: except heat_exc.HTTPNotFound:
placement_extracted = False pass
passwords = password_utils.generate_passwords( passwords = password_utils.generate_passwords(
stack_env=stack_env, stack_env=stack_env,