BUG-8342: force config-manager startup

config-manager needs to be pretty much the first thing that comes
up due to historic reasons. Assign it a low start level so it
activates before the blueprint extension.

Change-Id: I2d0a3706843409e8a22f9064f27e47cc0df46c95
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 21870dc0696930b3be36c689bc7ae0929c5b9878)

diff --git a/features/config/features-config/src/main/features/features.xml b/features/config/features-config/src/main/features/features.xml
index e34769d481fcc9fc5b17c976525aaff03fc92293..47d0df02944713b783adbe1aa9ef67ee946613f1 100644 (file)
--- a/features/config/features-config/src/main/features/features.xml
+++ b/features/config/features-config/src/main/features/features.xml
@@ -37,6 +37,6 @@
   </feature>
   <feature name='odl-config-manager' version='${project.version}' description="OpenDaylight :: Config :: Manager">
     <feature version='${project.version}'>odl-config-core</feature>
   </feature>
   <feature name='odl-config-manager' version='${project.version}' description="OpenDaylight :: Config :: Manager">
     <feature version='${project.version}'>odl-config-core</feature>

-    <bundle>mvn:org.opendaylight.controller/config-manager/{{VERSION}}</bundle>
+    <bundle start-level="35">mvn:org.opendaylight.controller/config-manager/{{VERSION}}</bundle>

   </feature>
 </features>
   </feature>
 </features>

diff --git a/features/config/odl-config-manager/pom.xml b/features/config/odl-config-manager/pom.xml
index 2ce6d4e2b002ce96354838908dd31c595325fde4..2b82463727cb4b7579805c3506fc4b92c00119b3 100644 (file)
--- a/features/config/odl-config-manager/pom.xml
+++ b/features/config/odl-config-manager/pom.xml
@@ -38,4 +38,4 @@
         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 

-</project>
\ No newline at end of file
+</project>

diff --git a/features/config/odl-config-manager/src/main/feature/feature.xml b/features/config/odl-config-manager/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..c5c322e
--- /dev/null
+++ b/features/config/odl-config-manager/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Pantheon Technologies, s.r.o. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-config-manager">
+    <repository>mvn:org.opendaylight.controller/odl-config-core/${project.version}/xml/features</repository>
+    <feature name="odl-config-manager" description="odl-config-manager" version="${project.version}">
+        <bundle start-level="35">mvn:org.opendaylight.controller/config-manager/${project.version}</bundle>
+    </feature>
+</features>