x/anvil
Code Issues Proposed changes

Moved python-nose into pip config and modified keystone_client and

Browse Source 
nova_client to pick up general.json from pips.
This commit is contained in:
Ken Thomas 2012-02-14 15:11:36 -08:00
parent 4157c2b856
commit 05c438c89f
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/pips/general.json
View File

@ -8,6 +8,9 @@
"coverage": { "coverage": {
"version": "3.5.1" "version": "3.5.1"
}, },
"nose": {
"version": "1.0.0"
},
"mock": { "mock": {
"version": "0.8.0" "version": "0.8.0"
} }

7
conf/pkgs/general.json
View File

@ -210,13 +210,6 @@
"version": "2.6*", "version": "2.6*",
"removable": false "removable": false
}, },
"python-nose1.1": {
"version": "1.1*",
"removable": true,
"meta": {
"epel" : true
}
},
"python-mox": { "python-mox": {
"version": "0.5.3*", "version": "0.5.3*",
"removable": true, "removable": true,

4
devstack/components/keystone_client.py
View File

@ -24,6 +24,7 @@ LOG = logging.getLogger("devstack.components.keystone_client")
#the pkg json files keystone client requires for installation #the pkg json files keystone client requires for installation
REQ_PKGS = ['general.json', 'keystone-client.json'] REQ_PKGS = ['general.json', 'keystone-client.json']
REQ_PIPS = ['general.json']
class KeyStoneClientUninstaller(comp.PythonUninstallComponent): class KeyStoneClientUninstaller(comp.PythonUninstallComponent):
@ -46,6 +47,9 @@ class KeyStoneClientInstaller(comp.PythonInstallComponent):
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 KeyStoneClientRuntime(comp.EmptyRuntime): class KeyStoneClientRuntime(comp.EmptyRuntime):
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):

4
devstack/components/nova_client.py
View File

@ -24,6 +24,7 @@ LOG = logging.getLogger("devstack.components.nova_client")
#the pkg json files nova client requires for installation #the pkg json files nova client requires for installation
REQ_PKGS = ['general.json', 'nova-client.json'] REQ_PKGS = ['general.json', 'nova-client.json']
REQ_PIPS = ['general.json']
class NovaClientUninstaller(comp.PythonUninstallComponent): class NovaClientUninstaller(comp.PythonUninstallComponent):
@ -46,6 +47,9 @@ class NovaClientInstaller(comp.PythonInstallComponent):
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 NovaClientRuntime(comp.EmptyRuntime): class NovaClientRuntime(comp.EmptyRuntime):
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):