openstack
/
python-tripleoclient
Code Issues Proposed changes

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
This commit is contained in:
Steven Hardy 2017-11-01 16:34:42 +00:00
parent 557323de8e
commit c5adb1c655
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleoclient/v1/overcloud_deploy.py
View File

@ -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,