Merge "Don't rewrite resource_registry values that aren't paths" into stable/pike
This commit is contained in:
commit
1d2ee4e9a7
|
@ -168,7 +168,10 @@ class DeployOvercloud(command.Command):
|
||||||
% (env_path, rsrc, new_rsrc_path))
|
% (env_path, rsrc, new_rsrc_path))
|
||||||
env_registry[rsrc] = new_rsrc_path
|
env_registry[rsrc] = new_rsrc_path
|
||||||
else:
|
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
|
env_map['resource_registry'] = env_registry
|
||||||
f_name = os.path.basename(os.path.splitext(abs_env_path)[0])
|
f_name = os.path.basename(os.path.splitext(abs_env_path)[0])
|
||||||
with tempfile.NamedTemporaryFile(dir=tht_root,
|
with tempfile.NamedTemporaryFile(dir=tht_root,
|
||||||
|
|
Loading…
Reference in New Issue