From b2b765a8994ffb88acc86532d1cfea0234fafb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 25 Jan 2021 22:36:16 +0100 Subject: [PATCH] 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 --- tripleoclient/v1/tripleo_deploy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index f7dba7c6c..3cb5718e3 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -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: