Added general json and apparently we really need cloudfiles for horizon.

conf/pips/general.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": {
+        "coverage": {
+            "version": "3.5.1"
+        }
+    }
+}

conf/pips/horizon.json

@@ -37,6 +37,9 @@
         },
         "sqlalchemy-migrate": {
             "version": "0.7.2"
+        },
+        "python-cloudfiles": {
+            "version": "1.7.9.3"
         }
     }
 }

conf/pkgs/horizon.json

@@ -29,10 +29,6 @@
             "version": "1.12*",
             "removable": true
         },
-        "python-xattr": {
-            "version": "0.6*",
-            "removable": true
-        },
         "python-sqlalchemy": {
             "version": "0.6*",
             "removable": true
@@ -103,12 +99,6 @@
             "removable": true
         },
         # Requires EPEL
-        "python-xattr": {
-            # This might be way to old :(
-            "version": "0.5*",
-            "removable": true
-        },
-        # Requires EPEL
         "python-webob1.0": {
             "version": "1.0*",
             "removable": true

devstack/component.py

@@ -174,7 +174,7 @@ class PkgInstallComponent(ComponentBase):
                 sh.write_file(tgtfn, contents)
                 self.tracewriter.cfg_write(tgtfn)
         return len(configs)
-        
+
     def _configure_symlinks(self):
         links = self._get_symlinks()
         for (source, link) in links.items():

devstack/components/glance.py

@@ -73,7 +73,7 @@ BIN_DIR = 'bin'
 REQ_PKGS = ['general.json', 'glance.json']
 
 #pip files that glance requires
-REQ_PIPS = ['glance.json']
+REQ_PIPS = ['general.json', 'glance.json']
 
 
 class GlanceUninstaller(comp.PythonUninstallComponent):

devstack/components/horizon.py

@@ -59,7 +59,7 @@ LOG = logging.getLogger("devstack.components.horizon")
 REQ_PKGS = ['general.json', 'horizon.json']
 
 #pip files that horizon requires
-REQ_PIPS = ['horizon.json']
+REQ_PIPS = ['general.json', 'horizon.json']
 
 
 class HorizonUninstaller(comp.PythonUninstallComponent):

devstack/components/keystone.py

@@ -60,7 +60,7 @@ APP_OPTIONS = {
 REQ_PKGS = ['general.json', 'keystone.json']
 
 #pip files that keystone requires
-REQ_PIPS = ['keystone.json']
+REQ_PIPS = ['general.json', 'keystone.json']
 
 
 class KeystoneUninstaller(comp.PythonUninstallComponent):

devstack/components/nova.py

@@ -179,7 +179,7 @@ QUANTUM_OPENSWITCH_OPS = {
 LIBVIRTD_RESTART = ['service', 'libvirtd', 'restart']
 
 #pip files that nova requires
-REQ_PIPS = ['nova.json']
+REQ_PIPS = ['general.json', 'nova.json']
 
 
 class NovaUninstaller(comp.PythonUninstallComponent):