Ignore stack-vstate-dropin.yaml for minion and uc

When loading user parameters the stack-vstate-dropin.yaml
is not yet available. It was ignored for the undercloud
case already, but not for the minion. This caused the
minion install to fail.

This changes it to ignore any file ending with
'-stack-vstate-dropin.yaml' to cover both undercloud and
minion cases.

Closes-Bug: #1913209
Change-Id: I464db87f8b2fa8c03ae9adea775c4567d44cd1e5
This commit is contained in:
Harald Jensås
2021-01-25 22:36:16 +01:00
parent 9e69c98d03
commit b2b765a899

View File

@@ -616,8 +616,9 @@ class Deploy(command.Command):
def _load_user_params(self, user_environments):
user_params = {}
for env_file in user_environments:
# undercloud heat stack virtual state tracking is'nt available yet
if env_file.endswith('undercloud-stack-vstate-dropin.yaml'):
# undercloud and minion heat stack virtual state tracking is not
# available yet
if env_file.endswith('-stack-vstate-dropin.yaml'):
continue
with open(env_file, 'r') as f: