Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Containerize Cinder-backup for HA"
[apex-tripleo-heat-templates.git]
/
tripleo_heat_templates
/
environment_generator.py
diff --git
a/tripleo_heat_templates/environment_generator.py
b/tripleo_heat_templates/environment_generator.py
index
b3e327f
..
876dd85
100755
(executable)
--- a/
tripleo_heat_templates/environment_generator.py
+++ b/
tripleo_heat_templates/environment_generator.py
@@
-68,6
+68,7
@@
def _generate_environment(input_env, parent_env=None):
if parent_env is None:
parent_env = {}
env = dict(parent_env)
+ env.pop('children', None)
env.update(input_env)
parameter_defaults = {}
param_names = []