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
(cherry picked from commit c5adb1c655
)
This commit is contained in:
parent
4198fe6dc0
commit
fc03b76a31
|
@ -168,7 +168,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,
|
||||
|
|
Loading…
Reference in New Issue