From: Saravanan KR <skramaja@redhat.com>
Date: Thu, 9 Feb 2017 12:55:10 +0000 (+0530)
Subject: Fix empty parameter_default error in environment file
X-Git-Tag: opnfv-6.0.0~1084^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8896c4e2c66c9d528c0438ae3a42341a583a5124;p=apex-tripleo-heat-templates.git

Fix empty parameter_default error in environment file

Providing an empty 'parameter_defaults' is resulting in overriding
of all the previously populated 'parameters_defaults' as None.
Commenting the empty statement and cleaned-up emtpy line in j2
templating.

Change-Id: I75bac6b558ac16a08e0964599cecae5bf10edf8a
---

diff --git a/environments/host-config-pre-network.j2.yaml b/environments/host-config-pre-network.j2.yaml
index fe1302b5..c79e28b4 100644
--- a/environments/host-config-pre-network.j2.yaml
+++ b/environments/host-config-pre-network.j2.yaml
@@ -1,12 +1,12 @@
 resource_registry:
 # Create the registry only for roles with the word "Compute" in it. Like ComputeOvsDpdk, ComputeSriov, etc.,
-{% for role in roles %}
+{%- for role in roles -%}
 {% if "Compute" in role.name %}
   OS::TripleO::{{role.name}}::PreNetworkConfig: ../extraconfig/pre_network/{{role.name.lower()}}-host_config_and_reboot.yaml
-{% endif %}
+{%- endif -%}
 {% endfor %}
 
-parameter_defaults:
+#parameter_defaults:
   # Sample parameters for Compute and ComputeOvsDpdk roles
   #ComputeKernelArgs: ""
   #ComputeTunedProfileName: ""