Remove OpenStackEndpointGBP

[groupbasedpolicy.git] / features / src / main / resources / features.xml

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 8e0f8c70bac616b3db6fd35743317d89157bedbe..154f3644d35006d071f17d7d22cc3fdfbb8a78fb 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -80,22 +80,6 @@
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.opflexconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-opflex-config/${project.version}/xml/config</configfile>
     </feature>
 
-    <!--
-         The OpenStack Group Based Policy Northbound API.
-
-         This is actually built/packaged with the OpenFlow
-         Overlay renderer at the moment. All that's needed
-         for this package is just the config file that wires
-         things in.
-    -->
-    <feature name='odl-groupbasedpolicy-openstackgbp' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Support OpenStack GBP Endpoints '>
-        <!-- DEPRECATED SOON.
-        <feature version="${project.version}">odl-groupbasedpolicy-ofoverlay</feature>
-        -->
-        <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.openstackendpointconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-openstackendpoint-config/${project.version}/xml/config</configfile>
-    </feature>
-
     <!--
          The Neutron provider
     -->
@@ -105,7 +89,9 @@
         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
         <feature version="${project.version}">odl-groupbasedpolicy-ofoverlay</feature>
         <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb/${project.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.neutronmapperconfigfile}">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper-config/${project.version}/xml/config</configfile>
+        <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.neutronovsdbconfigfile}">mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb-config/${project.version}/xml/config</configfile>
     </feature>
 
     <!--