Fixing up m2crypto removal, and isolating kvm/qemu to n-cpu.

conf/pkgs/n-cpu.json

@@ -16,6 +16,27 @@
         "open-iscsi-utils": {
             "version": "2.0*",
             "removable": true
+        },
+        # Only really needed if you plan on using kvm
+        "kvm": {
+            "version": "1:84*",
+            "removable": true
+        },
+        "qemu-kvm": {
+            "version": "0.14.*",
+            "removable": true
+        },
+        "python-libvirt": {
+            "version": "0.9.2*",
+            "removable": true
+        },
+        "libvirt-bin": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "libvirt0": {
+            "version": "0.9*",
+            "removable": true
         }
     },
     "rhel-6": {
@@ -26,6 +47,31 @@
         "iscsi-initiator-utils": {
             "version": "6.2*",
             "removable": true
+        },
+        # Only really needed if you plan on using kvm
+        "kvm": {
+            "version": "0.12*",
+            "removable": true
+        },
+        "qemu-kvm":  {
+            "version": "2*",
+            "removable": true
+        },
+        "qemu-img":  {
+            "version": "0.12*",
+            "removable": true
+        },
+        "libvirt-python": {
+            "version": "0.9.4*",
+            "removable": true
+        },
+        "libvirt-client": {
+            "version": "0.9.4*",
+            "removable": true
+        },
+        "libvirt": {
+            "version": "0.9.4*",
+            "removable": true
         }
     }
 }

conf/pkgs/nova.json

@@ -48,11 +48,6 @@
             "version": "2.3*",
             "removable": true
         },
-        # Only really needed if you plan on using kvm
-        "kvm": {
-            "version": "1:84*",
-            "removable": true
-        },
         "iptables": {
             "version": "1.4*",
             "removable": false
@@ -65,14 +60,6 @@
             "version": "3.7*",
             "removable": true
         },
-        "libvirt-bin": {
-            "version": "0.9*",
-            "removable": true
-        },
-        "libvirt0": {
-            "version": "0.9*",
-            "removable": true
-        },
         "vlan": {
             "version": "1.9*",
             "removable": true
@@ -98,10 +85,6 @@
             "version": "0.3*",
             "removable": true
         },
-        "python-libvirt": {
-            "version": "0.9.2*",
-            "removable": true
-        },
         "python-libxml2": {
             "version": "2.7*",
             "removable": true
@@ -147,8 +130,8 @@
             "version": "1:0*",
             "removable": true
         },
-        "python-m2crypto": {
+        "python-crypto": {
-            "version": "0.20*",
+            "version": "2.3*",
             "removable": true
         },
         "python-boto": {
@@ -197,11 +180,6 @@
             "version": "2.2*",
             "removable": true
         },
-        # Only really needed if you plan on using kvm
-        "kvm": {
-            "version": "0.12*",
-            "removable": true
-        },
         "iptables": {
             "version": "1.4*",
             "removable": false
@@ -215,14 +193,6 @@
             # Trashes alot of the base os (so we don't allow it to be removed)
             "removable": false
         },
-        "libvirt-client": {
-            "version": "0.9.4*",
-            "removable": true
-        },
-        "libvirt": {
-            "version": "0.9.4*",
-            "removable": true
-        },
         # ???
         # "vlan": {
         #     "version": "1.9*",
@@ -248,10 +218,6 @@
             "version": "0.3.1*",
             "removable": true
         },
-        "libvirt-python": {
-            "version": "0.9.4*",
-            "removable": true
-        },
         # This seems to kill RHN/yum if its removed ??
         # TODO verify
         "libxml2-python": {
@@ -289,10 +255,8 @@
             "version": "0.8*",
             "removable": true
         },
-        # This seems to kill RHN/yum if its removed ??
+        "python-crypto": {
-        # TODO verify
+            "version": "2.0*",
-        "m2crypto": {
-            "version": "0.20*",
             "removable": false
         },
         # Requires EPEL