Revert "Temporary remove neutron from K4 distro"

This reverts commit dd34852b73abbf125109d6d3ad5789605a1cb5f4.

Change-Id: I192e5d2efde585b69a2bd6991a83bc9e8b47c93a
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 199eef0e690dde7a2451b0307c89524e72c7cd32..23bea4bdbcf037d29e47eb019ebfdbb44a3ed6c1 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -218,14 +218,12 @@
         </dependency>
 
         <!-- Neutron Northbound -->
-        <!-- Temporary remove because SFT Server unhealth
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>features-neutron-service</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
 
         <!-- ODL Parent -->
         <dependency>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index a267a48d3f6f65e4be60628bfab0f29777f4cc7e..415945f8904f14326a0583f9e92a6749358c12c9 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -85,6 +85,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-bmp</artifactId>
@@ -155,14 +156,12 @@
         </dependency>
 
         <!-- Neutron Northbound -->
-        <!-- Temporary remove because SFT Server unhealth
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>odl-neutron-service</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        -->
 
         <!-- OpenflowPlugin -->
         <dependency>