From 6489b23c9304e4e20e871a20ae6c3bb54a710507 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 11 Apr 2012 09:36:11 -0400
Subject: Remove python-novaclient dependency from nova.

Nova should not depend on python-novaclient. Remove it.

Note: In order to get unit tests to pass I had to add in
a temporary dependency on httplib2. This is due to the fact
that pip installing glance does not properly setup all
the dependencies. See LP Bug #975483 for details.

Fixes LP Bug #978992.

Change-Id: I50c00139f9dc303223601230fd962abac977cd5e
---
 nova/compute/api.py | 1 -
 nova/exception.py   | 1 -
 tools/pip-requires  | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index d5d7723fa..aa584dba5 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -24,7 +24,6 @@ import functools
 import re
 import time
 
-import novaclient
 import webob.exc
 
 from nova import block_device
diff --git a/nova/exception.py b/nova/exception.py
index 3f649f5c2..5fa9e0c87 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -27,7 +27,6 @@ SHOULD include dedicated exception logging.
 import functools
 import sys
 
-import novaclient.exceptions
 import webob.exc
 
 from nova import log as logging
diff --git a/tools/pip-requires b/tools/pip-requires
index aa5cbe782..502b83a49 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -8,7 +8,6 @@ kombu==1.0.4
 lockfile==0.8
 lxml==2.3
 python-daemon==1.5.5
-python-novaclient
 routes==1.12.3
 WebOb==1.0.8
 wsgiref==0.1.2
@@ -24,3 +23,4 @@ feedparser
 pycrypto
 Babel>=0.9.6
 iso8601>=0.1.4
+httplib2
-- 
cgit