From a06ae5cf28e9788f8de85e3bc19793be327c7aa7 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 10 Feb 2012 12:12:59 -0800
Subject: [PATCH] Getting pip to use for numpy until fixed.

---
 conf/pips/n-vnc.json         | 11 +++++++++++
 conf/pkgs/n-vnc.json         |  2 ++
 devstack/components/novnc.py |  5 +++++
 3 files changed, 18 insertions(+)
 create mode 100644 conf/pips/n-vnc.json

diff --git a/conf/pips/n-vnc.json b/conf/pips/n-vnc.json
new file mode 100644
index 00000000..b835d366
--- /dev/null
+++ b/conf/pips/n-vnc.json
@@ -0,0 +1,11 @@
+# This is a extended json package definition file 
+# We allow simple comments (lines starting with a hash symbol)
+{
+    "ubuntu-oneiric": {
+    },
+    "rhel-6": {
+        "numpy": {
+            "version": "1.5"
+        }
+    }
+}
diff --git a/conf/pkgs/n-vnc.json b/conf/pkgs/n-vnc.json
index a06324ca..b4e97d2e 100644
--- a/conf/pkgs/n-vnc.json
+++ b/conf/pkgs/n-vnc.json
@@ -13,6 +13,8 @@
         }
     },
     "rhel-6": {
+        # This doesn't work yet, since it conflicts with the 
+        # Symlink we are making for python-nose1.1 from EPEL
         #"numpy": {
         #    "version": "1.3*",
         #    "removable": true
diff --git a/devstack/components/novnc.py b/devstack/components/novnc.py
index 41cf0ac4..d509129b 100644
--- a/devstack/components/novnc.py
+++ b/devstack/components/novnc.py
@@ -38,6 +38,9 @@ APP_OPTIONS = {
 #the pkg json files novnc requires for installation
 REQ_PKGS = ['n-vnc.json']
 
+#pip files that nova requires
+REQ_PIPS = ['general.json', 'n-vnc.json']
+
 
 class NoVNCUninstaller(comp.PkgUninstallComponent):
     def __init__(self, *args, **kargs):
@@ -59,6 +62,8 @@ class NoVNCInstaller(comp.PkgInstallComponent):
     def _get_pkgs(self):
         return list(REQ_PKGS)
 
+    def _get_pips(self):
+        return list(REQ_PIPS)
 
 class NoVNCRuntime(comp.ProgramRuntime):
     def __init__(self, *args, **kargs):