From 05c438c89fff484ee34d4052749097246f3b4e3b Mon Sep 17 00:00:00 2001
From: Ken Thomas <krt@yahoo-inc.com>
Date: Tue, 14 Feb 2012 15:11:36 -0800
Subject: [PATCH] Moved python-nose into pip config and modified
 keystone_client and nova_client to pick up general.json from pips.

---
 conf/pips/general.json                 | 3 +++
 conf/pkgs/general.json                 | 7 -------
 devstack/components/keystone_client.py | 4 ++++
 devstack/components/nova_client.py     | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/conf/pips/general.json b/conf/pips/general.json
index ca5142c8..8fc74397 100644
--- a/conf/pips/general.json
+++ b/conf/pips/general.json
@@ -8,6 +8,9 @@
         "coverage": {
             "version": "3.5.1"
         },
+        "nose": {
+            "version": "1.0.0"
+        },
         "mock": {
             "version": "0.8.0"
         }
diff --git a/conf/pkgs/general.json b/conf/pkgs/general.json
index 19837714..a0b088d6 100644
--- a/conf/pkgs/general.json
+++ b/conf/pkgs/general.json
@@ -210,13 +210,6 @@
             "version": "2.6*",
             "removable": false
         },
-        "python-nose1.1": {
-            "version": "1.1*",
-            "removable": true,
-            "meta": {
-                "epel" : true
-            }
-        },
         "python-mox": {
             "version": "0.5.3*",
             "removable": true,
diff --git a/devstack/components/keystone_client.py b/devstack/components/keystone_client.py
index e781a8a7..aff871a0 100644
--- a/devstack/components/keystone_client.py
+++ b/devstack/components/keystone_client.py
@@ -24,6 +24,7 @@ LOG = logging.getLogger("devstack.components.keystone_client")
 
 #the pkg json files keystone client requires for installation
 REQ_PKGS = ['general.json', 'keystone-client.json']
+REQ_PIPS = ['general.json']
 
 
 class KeyStoneClientUninstaller(comp.PythonUninstallComponent):
@@ -46,6 +47,9 @@ class KeyStoneClientInstaller(comp.PythonInstallComponent):
     def _get_pkgs(self):
         return list(REQ_PKGS)
 
+    def _get_pips(self):
+        return list(REQ_PIPS)
+
 
 class KeyStoneClientRuntime(comp.EmptyRuntime):
     def __init__(self, *args, **kargs):
diff --git a/devstack/components/nova_client.py b/devstack/components/nova_client.py
index edeea1a5..5ba89bd0 100644
--- a/devstack/components/nova_client.py
+++ b/devstack/components/nova_client.py
@@ -24,6 +24,7 @@ LOG = logging.getLogger("devstack.components.nova_client")
 
 #the pkg json files nova client requires for installation
 REQ_PKGS = ['general.json', 'nova-client.json']
+REQ_PIPS = ['general.json']
 
 
 class NovaClientUninstaller(comp.PythonUninstallComponent):
@@ -46,6 +47,9 @@ class NovaClientInstaller(comp.PythonInstallComponent):
     def _get_pkgs(self):
         return list(REQ_PKGS)
 
+    def _get_pips(self):
+        return list(REQ_PIPS)
+
 
 class NovaClientRuntime(comp.EmptyRuntime):
     def __init__(self, *args, **kargs):