Minor fix in JinJa CSV rendering

Listing no extra features left a trailing comma at the
end of the features list. This didn't cause a breakage,
but wasn't elegant. Should now work as expected.

Closes #1

Change-Id: I6b0a4b2359dd36f32bd38920e45e0c50502be098
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/templates/org.apache.karaf.features.cfg b/templates/org.apache.karaf.features.cfg
index 11ecf83bc35343dfecf81c5de21245d7eae823b8..03851db25a111c3de5b5288c22b70345cfbda8cd 100644 (file)
--- a/templates/org.apache.karaf.features.cfg
+++ b/templates/org.apache.karaf.features.cfg
@@ -43,9 +43,10 @@ featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.1/xml/features
 # Default features:
 # config,standard,region,package,kar,ssh,management
 #
-{# Defaults are specified in vars/main.yml of the ODL Ansible role. #}
+{# Feature list defaults are in vars/main.yml of the ODL Ansible role. #}
 {# Those are normally overridden by the role consumer, per their use-case. #}
-featuresBoot={{ [default_features|join(','), extra_features|join(',')]|join(',') }}
+{% set features = default_features + extra_features %}
+featuresBoot={{ features|join(',') }}
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)