Change in vdsm[master]: getVdsCaps verb is updated to provide glusterfs package info...

tjeyasin at redhat.com tjeyasin at redhat.com
Thu Jan 17 09:07:50 UTC 2013


Hello Ayal Baron, Bala.FA, Saggi Mizrahi, Federico Simoncelli, Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/11138

to review the following change.

Change subject: getVdsCaps verb is updated to provide glusterfs package info along with other key package details.
......................................................................

getVdsCaps verb is updated to provide glusterfs package info along
with other key package details.

Change-Id: I38991550e57c8f1e558f297cf12d984f7f0bc635
Signed-off-by: Timothy Asir <tjeyasin at redhat.com>
---
M vdsm/caps.py
1 file changed, 25 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/11138/1

diff --git a/vdsm/caps.py b/vdsm/caps.py
index a307200..125f30c 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -329,12 +329,21 @@
     pkgs = {'kernel': kernelDict()}
 
     if getos() in (OSName.RHEVH, OSName.OVIRT, OSName.FEDORA, OSName.RHEL):
+        GLUSTER_PACKAGES = ['glusterfs', 'glusterfs-debuginfo',
+                            'glusterfs-devel', 'glusterfs-fuse',
+                            'glusterfs-geo-replication', 'glusterfs-rdma',
+                            'glusterfs-server', 'glusterfs-swift',
+                            'glusterfs-swift-account',
+                            'glusterfs-swift-container', 'glusterfs-swift-doc',
+                            'glusterfs-swift-object', 'glusterfs-swift-proxy',
+                            'glusterfs-ufo']
         KEY_PACKAGES = ['qemu-kvm', 'qemu-img',
                         'vdsm', 'spice-server', 'libvirt', 'mom']
 
         try:
             ts = rpm.TransactionSet()
 
+            KEY_PACKAGES += GLUSTER_PACKAGES
             for pkg in KEY_PACKAGES:
                 try:
                     mi = ts.dbMatch('name', pkg).next()
@@ -350,12 +359,28 @@
             logging.error('', exc_info=True)
 
     elif getos() == OSName.DEBIAN and python_apt:
+        GLUSTER_PACKAGES = {
+            'gluster-swift-plugin': 'glusterfs-ufo',
+            'gluster-swift-account': 'glusterfs-swift-account',
+            'gluster-swift-doc': 'glusterfs-swift-doc',
+            'gluster-swift-object': 'glusterfs-swift-object',
+            'gluster-swift-container': 'glusterfs-swift-container',
+            'gluster-swift': 'glusterfs-swift',
+            'gluster-swift-proxy': 'glusterfs-swift-proxy',
+            'glusterfs': 'glusterfs',
+            'glusterfs-debuginfo': 'glusterfs-debuginfo',
+            'glusterfs-devel': 'glusterfs-devel',
+            'glusterfs-fuse': 'glusterfs-fuse',
+            'glusterfs-geo-replication': 'glusterfs-geo-replication',
+            'glusterfs-rdma': 'glusterfs-rdma',
+            'glusterfs-server': 'glusterfs-server'}
         KEY_PACKAGES = {'qemu-kvm': 'qemu-kvm', 'qemu-img': 'qemu-utils',
                         'vdsm': 'vdsmd', 'spice-server': 'libspice-server1',
                         'libvirt': 'libvirt0', 'mom': 'mom'}
 
         cache = apt.Cache()
 
+        KEY_PACKAGES.update(GLUSTER_PACKAGES)
         for pkg in KEY_PACKAGES:
             try:
                 deb_pkg = KEY_PACKAGES[pkg]


--
To view, visit http://gerrit.ovirt.org/11138
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38991550e57c8f1e558f297cf12d984f7f0bc635
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Timothy Asir <tjeyasin at redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron at redhat.com>
Gerrit-Reviewer: Bala.FA <barumuga at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi at redhat.com>


More information about the vdsm-patches mailing list