Merge "Load config system files in etc/opendaylight/karaf"

diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index 464cdb2915b77eb37f56af61074f5e21accdb400..6e50363fedca7302e1283913b29a3d0a50b6a3db 100644 (file)
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -42,6 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <idmanager.version>${genius.version}</idmanager.version>
     <itm.version>${genius.version}</itm.version>
     <neutronvpn.version>${vpnservices.version}</neutronvpn.version>
+    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
   <dependencyManagement>
     <dependencies>

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index e77ebbabaf2ad1b3f4968b11c1efca0330ab8450..8e66b0de885552aef21ca51c08be8aa60888086d 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -73,15 +73,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.1.0-SNAPSHOT</bundle>-->
     <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
     <!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
-    <configfile finalname="bgpmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/bgpmanager-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="vpnmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/vpnmanager-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="fibmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/fibmanager-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="neutronvpn-impl-default-config.xml">mvn:org.opendaylight.netvirt/neutronvpn-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="dhcpservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/dhcpservice-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="elanmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="natservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/natservice-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="aclservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}/xml/config</configfile>
-    <configfile finalname="ipv6service-impl-default-config.xml">mvn:org.opendaylight.netvirt/ipv6service-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/bgpmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/bgpmanager-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/vpnmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/vpnmanager-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/fibmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/fibmanager-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/neutronvpn-impl-default-config.xml">mvn:org.opendaylight.netvirt/neutronvpn-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/dhcpservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/dhcpservice-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/elanmanager-impl-default-config.xml">mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/natservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/natservice-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/aclservice-impl-default-config.xml">mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="${configfile.directory}/ipv6service-impl-default-config.xml">mvn:org.opendaylight.netvirt/ipv6service-impl/{{VERSION}}/xml/config</configfile>
 
   </feature>
   <feature name='odl-netvirt-vpnservice-openstack' version='${project.version}' description='OpenDaylight :: vpnservice :: openstack'>