Add new feature called odl-netvirt-openstack to replace

odl-netvirt-vpnservice openstack

Change-Id: I1c102063c4bc4c85cba85621cfa90058145c017e
Signed-off-by: Andre Fredette <afredette@redhat.com>

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index 8e66b0de885552aef21ca51c08be8aa60888086d..579f35228696066555e7ef1b1921da71f9377ce6 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -82,11 +82,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <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'>
     <feature version="${neutron.version}">odl-neutron-service</feature>
     <feature version="${project.version}">odl-netvirt-vpnservice-impl</feature>
     <feature version="${restconf.version}">odl-restconf</feature>
   </feature>
-  </features>
+
+  <feature name='odl-netvirt-openstack' version='${project.version}' description='OpenDaylight :: NetVirt :: OpenStack'>
+    <feature version="${neutron.version}">odl-neutron-service</feature>
+    <feature version="${project.version}">odl-netvirt-vpnservice-impl</feature>
+    <feature version="${restconf.version}">odl-restconf</feature>
+  </feature>
+
+</features>