From 211bbc8d20f84fe0732ec781f81b84d3dfb3974f Mon Sep 17 00:00:00 2001
From: Doug Wiegley <dougw@a10networks.com>
Date: Fri, 19 Dec 2014 14:42:44 -0700
Subject: [PATCH] Do not list neutron in requirements.txt

It does not play nicely with openstack/requirements

Partially-Implements: blueprint services-split

Change-Id: I2fbe139ef78a8fb528b8ac67f00852ce7a29e4ae
---
 requirements.txt | 5 ++++-
 tox.ini          | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index bdfde15b9..31fe810d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -35,4 +35,7 @@ oslo.utils>=1.0.0                       # Apache-2.0
 
 python-novaclient>=2.18.0
 
--e git+https://git.openstack.org/openstack/neutron#egg=neutron
+# This project does depend on neutron as a library, but the
+# openstack tooling does not play nicely with projects that
+# are not publicly available in pypi.
+# -e git+https://git.openstack.org/openstack/neutron#egg=neutron
diff --git a/tox.ini b/tox.ini
index 3c2707dd1..3d286765f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,10 @@ skipsdist = True
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
 usedevelop = True
-install_command = pip install -r requirements.txt -U {opts} {packages}
-deps = -r{toxinidir}/test-requirements.txt
+install_command = pip install -U {opts} {packages}
+deps = -egit+https://git.openstack.org/openstack/neutron#egg=neutron
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
 commands =
   sh tools/pretty_tox.sh '{posargs}'