diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2017-05-16 16:06:41 -0500 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2017-06-12 15:02:50 -0500 |
| commit | 204a5820995dd694fcd58d61fc6cf34a8955da92 (patch) | |
| tree | 5eab4d0af9aeed49453d3c9fbd714ede882ed296 /tripleo_heat_templates/environment_generator.py | |
| parent | 8d086b171099f0a968f1fdd1b39706ec64a52f56 (diff) | |
Add nested sample environments for inject-trust-anchor
Fix a bug that prevented these working. A unit test and
documentation for the nested environment functionality is also
included.
Change-Id: I2d4aeb584eb624178d601cfd6bc0a6473cb5289f
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 = [] |