Merge "Fix - Bug 2638 - Integration templates have incorrect directory name"

diff --git a/test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template b/test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
index aaac53c2025bbca8fd29ecf3f2ca487912044893..8f1e2f2b666b06c3df11d7a54c995b0fecf82d82 100644 (file)
--- a/test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
+++ b/test/tools/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
@@ -35,7 +35,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-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/{{ODL_DISTRIBUTION}}/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-index/{{ODL_DISTRIBUTION}}/xml/features
 
 #
 # Comma separated list of features to install at startup

diff --git a/test/tools/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template b/test/tools/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
index b97081b36088f6155392208ba25f3c21c72c9c4e..7c5ab3a3d526f72ccac5388a06c66cc4d094e798 100644 (file)
--- a/test/tools/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
+++ b/test/tools/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
@@ -35,7 +35,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-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/{{ODL_DISTRIBUTION}}/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-index/{{ODL_DISTRIBUTION}}/xml/features
 
 #
 # Comma separated list of features to install at startup