diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-19 15:27:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-19 15:27:00 +0000 |
| commit | 11a97ec7430118bbf4a11c87eceb3adec40ea4ac (patch) | |
| tree | c6334a938c1764969fe2abc8f36ae69d2b6b8e28 /tripleo_heat_templates/environment_generator.py | |
| parent | 77eec6867a064e8764745375940cf085be958c2f (diff) | |
| parent | 204a5820995dd694fcd58d61fc6cf34a8955da92 (diff) | |
Merge "Add nested sample environments for inject-trust-anchor"
Diffstat (limited to 'tripleo_heat_templates/environment_generator.py')
| -rwxr-xr-x | tripleo_heat_templates/environment_generator.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tripleo_heat_templates/environment_generator.py b/tripleo_heat_templates/environment_generator.py index b3e327f0..876dd854 100755 --- 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 = [] |