diff --git a/conf/pips/glance.json b/conf/pips/glance.json index 2e40719c..1cb9966c 100644 --- a/conf/pips/glance.json +++ b/conf/pips/glance.json @@ -13,7 +13,6 @@ "Routes": { "version": "1.12.3" }, - #the base is 2.0, need to upgrade "pycrypto": { "version": "2.5", diff --git a/conf/pips/quantum.json b/conf/pips/quantum.json new file mode 100644 index 00000000..59f4e762 --- /dev/null +++ b/conf/pips/quantum.json @@ -0,0 +1,30 @@ +# This is a extended json package definition file +# We allow simple comments (lines starting with a hash symbol) +{ + "ubuntu-oneiric": { + }, + "rhel-6": { + "SQLAlchemy": { + "version": "0.7.5" + }, + "sqlalchemy-migrate": { + "version": "0.7.2" + }, + #the newest we can get is 1.3.3 from epel/rhel + #this causes issues like the following + #https://answers.launchpad.net/nova/+question/174160 + #https://answers.launchpad.net/nova/+question/185116 + "PasteDeploy": { + "version": "1.5" + }, + "PasteScript": { + "version": "1.7.5" + }, + "Paste": { + "version": "1.7.5.1" + }, + "Routes": { + "version": "1.12.3" + } + } +} diff --git a/conf/pkgs/quantum-openvswitch.json b/conf/pkgs/quantum-openvswitch.json index 866e86ae..f9088f8d 100644 --- a/conf/pkgs/quantum-openvswitch.json +++ b/conf/pkgs/quantum-openvswitch.json @@ -24,14 +24,15 @@ } }, "rhel-6": { - #TBD + "MySQL-python": { + "version": "1.2*", + "removable": true + }, + "SQLAlchemy": { + "version": "0.7.5" + } }, "fedora-16": { - # Not available yet -# "openvswitch": { -# "version": "1.4*", -# "removable": true -# }, # Seems needed for ovs_quantum_agent.py "python-sqlalchemy": { "version": "0.7*", diff --git a/conf/pkgs/quantum.json b/conf/pkgs/quantum.json index 21e3bdfa..7b74ce1c 100644 --- a/conf/pkgs/quantum.json +++ b/conf/pkgs/quantum.json @@ -35,9 +35,33 @@ } }, "rhel-6": { - #TBD + "python-greenlet": { + "version": "0.3.1*", + "removable": true, + "meta": { + "epel" : true + } + }, + "python-eventlet": { + "version": "0.9*", + "removable": true, + "meta": { + "epel" : true + } + }, + "python-gflags": { + "version": "1.4*", + "removable": true, + "meta": { + "epel" : true + } + }, + "libxml2-python": { + "version": "2.7*", + "removable": false + } }, - "fedoara-16": { + "fedora-16": { "python-eventlet": { "version": "0.9*", "removable": true diff --git a/devstack/components/quantum.py b/devstack/components/quantum.py index 0303c894..9ee45252 100644 --- a/devstack/components/quantum.py +++ b/devstack/components/quantum.py @@ -70,6 +70,9 @@ APP_OPTIONS = { #the pkg json files quantum requires for installation REQ_PKGS = ['general.json', 'quantum.json'] +#pip files that nova requires +REQ_PIPS = ['quantum.json'] + class QuantumUninstaller(comp.PkgUninstallComponent): def __init__(self, *args, **kargs): @@ -102,6 +105,9 @@ class QuantumInstaller(comp.PkgInstallComponent): }) return places + def _get_pips(self): + return list(REQ_PIPS) + def get_dependencies(self): common_deps = comp.PkgInstallComponent.get_dependencies(self) add_deps = list()