openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Don't rewrite resource_registry values that aren't paths" into stable/pike

This commit is contained in:
Zuul 2017-11-15 12:09:58 +00:00 committed by Gerrit Code Review
parent 6dad59b242 fc03b76a31
commit 1d2ee4e9a7
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

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