x/anvil
Code Issues Proposed changes

Getting pip to use for numpy until fixed.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-10 12:12:59 -08:00
parent 28e6ac2512
commit a06ae5cf28
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
conf/pips/n-vnc.json Normal file
View File

@ -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"
}
}
}

2
conf/pkgs/n-vnc.json
View File

@ -13,6 +13,8 @@
} }
}, },
"rhel-6": { "rhel-6": {
# This doesn't work yet, since it conflicts with the
# Symlink we are making for python-nose1.1 from EPEL
#"numpy": { #"numpy": {
# "version": "1.3*", # "version": "1.3*",
# "removable": true # "removable": true

5
devstack/components/novnc.py
View File

@ -38,6 +38,9 @@ APP_OPTIONS = {
#the pkg json files novnc requires for installation #the pkg json files novnc requires for installation
REQ_PKGS = ['n-vnc.json'] REQ_PKGS = ['n-vnc.json']
#pip files that nova requires
REQ_PIPS = ['general.json', 'n-vnc.json']
class NoVNCUninstaller(comp.PkgUninstallComponent): class NoVNCUninstaller(comp.PkgUninstallComponent):
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
@ -59,6 +62,8 @@ class NoVNCInstaller(comp.PkgInstallComponent):
def _get_pkgs(self): def _get_pkgs(self):
return list(REQ_PKGS) return list(REQ_PKGS)
def _get_pips(self):
return list(REQ_PIPS)
class NoVNCRuntime(comp.ProgramRuntime): class NoVNCRuntime(comp.ProgramRuntime):
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):