Move pip list for Oneiric from JSON files into YAML file.

conf/distros/ubuntu-oneiric.yaml

@@ -142,6 +142,9 @@ components:
       - name: wget
         removable: false
         version: 1.12*
+    pips:
+      - name: mock
+        version: 0.8.0
 
   glance:
     install: devstack.components.glance:GlanceInstaller
@@ -186,6 +189,9 @@ components:
       - name: python-httplib2
         version: 0.7*
         removable: true
+    pips:
+      - name: iso8601
+        version: 0.1.4
 
   horizon:
     install: devstack.components.horizon:HorizonInstaller
@@ -259,6 +265,13 @@ components:
       - name: python-webob
         removable: True
         version: 1.0*
+    pips:
+      - name: django-nose-selenium
+        version: 0.7.3
+      - name: pycrypto
+        version: 2.3
+      - name: python-cloudfiles
+        version: 1.7.9.3
 
   keystone-client:
     install: devstack.components.keystone_client:KeyStoneClientInstaller
@@ -339,6 +352,9 @@ components:
       - name: sqlite3
         removable: True
         version: 3.7*
+    pips:
+      - name: passlib
+        version: 1.5.3
 
   melange:
     install: devstack.components.melange:MelangeInstaller
@@ -577,6 +593,9 @@ components:
       - name: vlan
         removable: True
         version: 1.9*
+    pips:
+      - name: iso8601
+        version: 0.1.4
 
   quantum-client:
     install: devstack.components.quantum_client:QuantumClientInstaller

conf/pips/general.json

@@ -1,11 +1,6 @@
 # This is a extended json package definition file 
 # We allow simple comments (lines starting with a hash symbol)
 {
-    "ubuntu-oneiric": {
-        "mock": {
-            "version": "0.8.0"
-        }
-    },
     "rhel-6": {
         "coverage": {
             "version": "3.5.1"

conf/pips/glance.json

@@ -1,11 +1,6 @@
 # This is a extended json package definition file 
 # We allow simple comments (lines starting with a hash symbol)
 {
-    "ubuntu-oneiric": {
-        "iso8601": {
-            "version": "0.1.4"
-        }
-    },
     "rhel-6": {
         "SQLAlchemy": {
             "version": "0.7.5"

conf/pips/horizon.json

@@ -1,17 +1,6 @@
 # This is a extended json package definition file 
 # We allow simple comments (lines starting with a hash symbol)
 {
-    "ubuntu-oneiric": {
-        "django-nose-selenium": {
-            "version": "0.7.3"
-        },
-        "pycrypto": {
-            "version": "2.3"
-        },
-        "python-cloudfiles": {
-            "version": "1.7.9.3"
-        }
-    },
     "rhel-6": {
         #the base is 2.0, need to upgrade
         "pycrypto": {

conf/pips/keystone.json

@@ -1,11 +1,6 @@
 # This is a extended json package definition file 
 # We allow simple comments (lines starting with a hash symbol)
 {
-    "ubuntu-oneiric": {
-        "passlib": {
-            "version": "1.5.3"
-        }
-    },
     "rhel-6": {
         "SQLAlchemy": {
             "version": "0.7.5"

conf/pips/n-vnc.json

@@ -1,8 +1,6 @@
 # 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"

conf/pips/nova.json

@@ -1,11 +1,6 @@
 # This is a extended json package definition file 
 # We allow simple comments (lines starting with a hash symbol)
 {
-    "ubuntu-oneiric": {
-        "iso8601": {
-            "version": "0.1.4"
-        }
-    },
     "rhel-6": {
         "SQLAlchemy": {
             "version": "0.7.5"

conf/pips/quantum.json

@@ -1,8 +1,6 @@
 # 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"