From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Thu, 27 Jul 2017 06:13:48 +0000 (-0700)
Subject: Revert "Temporary remove neutron from K4 distro"
X-Git-Tag: release/nitrogen~34
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=73d3beb8b7027731da3bf7c1e6f0a5411e5615db;p=integration%2Fdistribution.git

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 199eef0e..23bea4bd 100644
--- 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 a267a48d..415945f8 100644
--- 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>