Change in vdsm[master]: virt: tolerate missing ovirt-vmconsole group

fromani at redhat.com fromani at redhat.com
Tue Jun 16 16:08:42 UTC 2015


Francesco Romani has uploaded a new change for review.

Change subject: virt: tolerate missing  ovirt-vmconsole group
......................................................................

virt: tolerate missing  ovirt-vmconsole group

To support the virtio serial console feature,
VDSM must bind the virtio channel to an unix
domain socket, and fix its permissions and
group in order to let ovirt-vmconsole-host
connect to that socket.

ovirt-vmconsole-host it is a soft dependency.
VDSM should happily run without that package,
but incorrectly assumed the ovirt-vmconsole
group existed in the system

This patch lift this requirement:
VDSM still try to fix the group of the socket,
but if the group doesn't exist, it happily
goes ahead.

Change-Id: I55b708953e5871053f0063bb82434c5c0dcb6103
Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1223671
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/virt/vmdevices/core.py
1 file changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/42451/1

diff --git a/vdsm/virt/vmdevices/core.py b/vdsm/virt/vmdevices/core.py
index a847ce0..4d56005 100644
--- a/vdsm/virt/vmdevices/core.py
+++ b/vdsm/virt/vmdevices/core.py
@@ -99,9 +99,14 @@
 
     def prepare(self):
         if self._path:
-            supervdsm.getProxy().prepareVmChannel(
-                self._path,
-                constants.OVIRT_VMCONSOLE_GROUP)
+            try:
+                supervdsm.getProxy().prepareVmChannel(
+                    self._path,
+                    constants.OVIRT_VMCONSOLE_GROUP)
+            except KeyError:
+                self.log.warn('unknown group %s, permissions not updated',
+                              constants.OVIRT_VMCONSOLE_GROUP)
+
 
     def cleanup(self):
         if self._path:


-- 
To view, visit https://gerrit.ovirt.org/42451
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I55b708953e5871053f0063bb82434c5c0dcb6103
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list