From 6ed0955049cd7ae7b11a0a5ae8ab167d1c8d3d9c Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 13 Jul 2018 15:01:33 +0100 Subject: [PATCH] Respect THT_HOME for vstate dropin file Currently this points to /usr/share even when THT_HOME is set. Change-Id: I000e8e9c101a9b1e0568b192e02938f83de128f9 Closes-Bug: #1781600 --- tripleoclient/v1/undercloud_config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index c61d0d354..53bebbd19 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -568,8 +568,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False, # Always add a drop-in for the ephemeral undercloud heat stack # virtual state tracking (the actual file will be created later) stack_vstate_dropin = os.path.join( - CONF.get('templates') or constants.TRIPLEO_HEAT_TEMPLATES, - 'undercloud-stack-vstate-dropin.yaml') + tht_templates, 'undercloud-stack-vstate-dropin.yaml') deploy_args += ["-e", stack_vstate_dropin] if force_stack_update: deploy_args += ["--force-stack-update"]