Update features template to use Karaf repo vars

Closes #14

Change-Id: Id460cca040577b7d61ded4373fa201ff6dfb0e53
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 03851db25a111c3de5b5288c22b70345cfbda8cd..c9e7c7417b2489896c410af65f742d062c4c76bd 100644 (file)
--- a/templates/org.apache.karaf.features.cfg
+++ b/templates/org.apache.karaf.features.cfg
@@ -35,8 +35,13 @@
 
 #
 # Comma separated list of features repositories to register by default
+# Default repos:
+# mvn:org.apache.karaf.features/standard/3.0.1/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features,mvn:org.apache.karaf.features/spring/3.0.1/xml/features,mvn:org.opendaylight.integration/features-integration/0.2.3-Helium-SR3/xml/features
 #
-featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.1/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.1/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.0/xml/features,mvn:org.apache.karaf.features/spring/3.0.1/xml/features,mvn:org.opendaylight.integration/features-integration/0.2.3-Helium-SR3/xml/features
+{# Feature repo list defaults are in vars/main.yml of the ODL Ansible role. #}
+{# Those are normally overridden by the role consumer, per their use-case. #}
+{% set feature_repos = default_feature_repos + extra_feature_repos %}
+featuresRepositories = {{ feature_repos|join(',') }}
 
 #
 # Comma separated list of features to install at startup