From: Luis Gomez Date: Sat, 24 Jan 2015 10:21:18 +0000 (+0000) Subject: Merge "Fix - Bug 2638 - Integration templates have incorrect directory name" X-Git-Tag: release/helium-sr2~1 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b4bc73a75a97b1d584ce4caf94237d27fb581493;hp=1c43f85c66cd4e17c5edf7a93e3eeb97c8398215;p=integration%2Ftest.git 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 aaac53c202..8f1e2f2b66 100644 --- 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 b97081b360..7c5ab3a3d5 100644 --- 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