Update ODL Lithium Karaf feature repos for SR2

The 3-candidate RPM repo now installs ODL SR2, so the templated Karaf
feature repos need to be updated to find Li SR2 artifacts.

Change-Id: I7354651d6048080491f0cc0b7760bd7f6f093677
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 800280a4d97365a34ed631abef9240b9f4a8f436..689443d07ba913374f3a1a3d2f5934184e7418f1 100644 (file)
--- a/templates/org.apache.karaf.features.cfg
+++ b/templates/org.apache.karaf.features.cfg
@@ -36,7 +36,7 @@
 #
 # Comma separated list of features repositories to register by default
 # Default repos:
-# mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.0-Lithium/xml/features
+# mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.2-Lithium-SR2/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. #}

diff --git a/vars/main.yml b/vars/main.yml
index c311f90ba2789143592848bad7508fea1f4c9945..181ae515f741a343c7c715d424323121b3d21445 100644 (file)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -43,7 +43,7 @@ default_feature_repos:
   - 'mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features'
   - 'mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features'
   - 'mvn:org.apache.karaf.features/spring/3.0.3/xml/features'
-  - 'mvn:org.opendaylight.integration/features-integration-index/0.3.0-Lithium/xml/features'
+  - 'mvn:org.opendaylight.integration/features-integration-index/0.3.2-Lithium-SR2/xml/features'
 
 # Karaf feature repositories to install *in addition* to the defaults repos
 # configured in the ODL release artifact. You may need to override this to