From c5adb1c6551a609d6786853747407f991c2fb274 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 1 Nov 2017 16:34:42 +0000 Subject: [PATCH] Don't rewrite resource_registry values that aren't paths If you map to e.g OS::Heat::None, the current code adds an unwanted path prefix to these entries if the environment triggers this legacy fallback path (e.g it references files outside of tht_root). Change-Id: Id591c1a119c3471b599dcaddb363f3d353d25fff Closes-Bug: #1729039 --- tripleoclient/v1/overcloud_deploy.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 36a417cd7..d82d7063e 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -217,7 +217,10 @@ class DeployOvercloud(command.Command): % (env_path, rsrc, new_rsrc_path)) env_registry[rsrc] = new_rsrc_path else: - env_registry[rsrc] = abs_rsrc_path + # Skip any resources that are mapping to OS::* + # resource names as these aren't paths + if not rsrc_path.startswith("OS::"): + env_registry[rsrc] = abs_rsrc_path env_map['resource_registry'] = env_registry f_name = os.path.basename(os.path.splitext(abs_env_path)[0]) with tempfile.NamedTemporaryFile(dir=tht_root,