summaryrefslogtreecommitdiffstats
path: root/tripleo_heat_templates
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-02 08:53:30 +0000
committerGerrit Code Review <review@openstack.org>2017-09-02 08:53:30 +0000
commit79bd4a5c576829470ee0605551cee89233732021 (patch)
tree63712bbd86c933e4857309d5117befa31630314d /tripleo_heat_templates
parent878d236f7bd1aaa214acd37a74477c109ba756f2 (diff)
parentca4b08bb6df610f7eea6e40e9e0ca445091369fa (diff)
Merge "Convert enable-internal-tls.yaml to be generated" into stable/pike
Diffstat (limited to 'tripleo_heat_templates')
-rwxr-xr-xtripleo_heat_templates/environment_generator.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tripleo_heat_templates/environment_generator.py b/tripleo_heat_templates/environment_generator.py
index f1469390..e13690dd 100755
--- a/tripleo_heat_templates/environment_generator.py
+++ b/tripleo_heat_templates/environment_generator.py
@@ -159,7 +159,7 @@ def _generate_environment(input_env, parent_env=None):
for line in env_desc.splitlines():
env_file.write(u'# %s\n' % line)
- if parameter_defaults:
+ if parameter_defaults or static_defaults:
env_file.write(u'parameter_defaults:\n')
for name, value in sorted(parameter_defaults.items()):
write_sample_entry(env_file, name, value)