vdsm-patches November 2012

vdsm-patches@lists.fedorahosted.org

50 participants
416 discussions

Change in vdsm[master]: storage/misc.py: fix raise call for pep8
by Douglas Schilling Landgraf 27 Nov '12

27 Nov '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: storage/misc.py: fix raise call for pep8 ...................................................................... storage/misc.py: fix raise call for pep8 The commit 08b9f16a6213298b31ca68f2c89556f0b23874a4 introduced the below pep8 error when generating vdsm rpm. vdsm/storage/misc.py:741:33: W602 deprecated form of raising exception This patch fix the raise call. Change-Id: I7f3d2dd8993d9567ac787f738f71f60c8545c8c0 Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm/storage/misc.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/9523/1 diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 6360dcf..9126080 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -738,7 +738,7 @@ # re-raise the earliest exception if firstException is not None: - raise firstException, None, traceback + raise firstException(None, traceback) def defer(self, func, *args, **kwargs): self._finally.append((func, args, kwargs)) -- To view, visit http://gerrit.ovirt.org/9523 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f3d2dd8993d9567ac787f738f71f60c8545c8c0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

3 10

Change in vdsm[master]: BZ#870024 - Make sure during upgrade that lease files have ...
by Haim Ateya 27 Nov '12

27 Nov '12

Haim Ateya has uploaded a new change for review. Change subject: BZ#870024 - Make sure during upgrade that lease files have correct permission ...................................................................... BZ#870024 - Make sure during upgrade that lease files have correct permission Fix a bug where we tried to initialize sanlock lock before calling the function to set proper permissions. Change-Id: If28c48d2aeedd092ff3b8100dd64cd8ba673e94f Signed-off-by: Haim Ateya <hateya(a)redhat.com> --- M vdsm/storage/imageRepository/formatConverter.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/17/9517/1 diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py index 190f9b6..c7952d8 100644 --- a/vdsm/storage/imageRepository/formatConverter.py +++ b/vdsm/storage/imageRepository/formatConverter.py @@ -90,6 +90,10 @@ log = logging.getLogger('Storage.v3DomainConverter') log.debug("Starting conversion for domain %s", domain.sdUUID) + if domain.getStorageType() in sd.FILE_DOMAIN_TYPES: + log.debug("Setting permissions for domain %s", domain.sdUUID) + domain.setMetadataPermissions() + log.debug("Initializing the new cluster lock for domain %s", domain.sdUUID) newClusterLock = safelease.SANLock(domain.sdUUID, domain.getIdsFilePath(), domain.getLeasesFilePath()) @@ -100,8 +104,6 @@ V2META_SECTORSIZE = 512 - if domain.getStorageType() in sd.FILE_DOMAIN_TYPES: - domain.setMetadataPermissions() def v3ResetMetaVolSize(vol): # BZ811880 Verifiying that the volume size is the same size advertised -- To view, visit http://gerrit.ovirt.org/9517 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If28c48d2aeedd092ff3b8100dd64cd8ba673e94f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Haim Ateya <hateya(a)redhat.com>

6 16

Change in vdsm[master]: Sending sigkill to verify svdsm suicide
by ybronhei＠redhat.com 27 Nov '12

27 Nov '12

Yaniv Bronhaim has uploaded a new change for review. Change subject: Sending sigkill to verify svdsm suicide ...................................................................... Sending sigkill to verify svdsm suicide Svdsm was alive after restart of vdsm. svdsm should use pokeParent thread to distinguish vdsm pid status, when it recognizes that vdsm pid is not exist, svdsm kills itself by sending SIGKILL. The patch changes the signal to SIGKILL and verifies that in the except scope we won't get exception before calling to os.kill. Change-Id: I2eb8f1a74f818cd10a08572c9adb5de1c0e21f5a Bug-Id: https://bugzilla.redhat.com/show_bug.cgi?id=875486 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm/supervdsmServer.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/9196/1 diff --git a/vdsm/supervdsmServer.py b/vdsm/supervdsmServer.py index a1bf8e6..0836b1b 100755 --- a/vdsm/supervdsmServer.py +++ b/vdsm/supervdsmServer.py @@ -293,8 +293,9 @@ os.kill(parentPid, 0) sleep(2) except Exception: - os.unlink(ADDRESS) - os.kill(os.getpid(), signal.SIGTERM) + if os.path.exists(ADDRESS): + os.unlink(ADDRESS) + os.kill(os.getpid(), signal.SIGKILL) def main(): -- To view, visit http://gerrit.ovirt.org/9196 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2eb8f1a74f818cd10a08572c9adb5de1c0e21f5a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 7

Change in vdsm[master]: vdsm.spec: Add packages versions for rhel7
by Douglas Schilling Landgraf 27 Nov '12

27 Nov '12

Douglas Schilling Landgraf has uploaded a new change for review. Change subject: vdsm.spec: Add packages versions for rhel7 ...................................................................... vdsm.spec: Add packages versions for rhel7 Add macro for RHEL7 packages. Change-Id: Ia556789f9a2456f255d822f7e28877168d603f6e Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com> --- M vdsm.spec.in 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/9428/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 3fa3395..087f148 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -79,6 +79,22 @@ %endif %if 0%{?rhel} +%if 0%{?rhel} >= 7 +# Subprocess and thread bug was found on python 2.7.2 +Requires: python >= 2.7.3 +Requires: qemu-kvm >= 2:1.2.0 +Requires: qemu-kvm-img >= 2:1.2.0 +Requires: libvirt >= 0.10.1-1 +Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client +Requires: iscsi-initiator-utils >= 6.2.0.872-14 +Requires: device-mapper-multipath >= 0.4.9-18 +Requires: e2fsprogs >= 1.41.14 +Requires: kernel >= 3.6 +Requires: sanlock >= 2.4-2, sanlock-python +Requires: sed >= 4.2.1-10 +Requires: selinux-policy-targeted >= 3.10.0-149 +Requires: lvm2 >= 2.02.95 +%else Requires: python # Update the qemu-kvm requires when block_stream will be included Requires: qemu-kvm >= 2:0.12.1.2-2.295.el6_3.4 @@ -93,6 +109,7 @@ Requires: initscripts >= 9.03.31-2.el6_3.1 Requires: selinux-policy-targeted >= 3.7.19-80 Requires: lvm2 >= 2.02.95-10.el6_3.2 +%endif %else # Subprocess and thread bug was found on python 2.7.2 Requires: python >= 2.7.3 -- To view, visit http://gerrit.ovirt.org/9428 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia556789f9a2456f255d822f7e28877168d603f6e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>

4 22

Change in vdsm[master]: configNetwork: Fix a race between dhcp thread and connectivi...
by wudxw＠linux.vnet.ibm.com 27 Nov '12

27 Nov '12

Mark Wu has uploaded a new change for review. Change subject: configNetwork: Fix a race between dhcp thread and connectivity check ...................................................................... configNetwork: Fix a race between dhcp thread and connectivity check If dhcp is not done before the connectivity check, it can't detect the problem if the host loses connection to engine. This problem is found due to the engine bug(BZ838816): engine wrongly configures dhcp for management network, and then engine can't connect to the vdsm host because the ip address changes. This patch adds an event to synchronize dhcp thread and connectivity check. Change-Id: Id1a1fb8ef4cd88e2144f30cf8dd3f09b8dd8126f Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/configNetwork.py 1 file changed, 36 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/01/7401/1 diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index d55a2cc..0617bbe 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -32,11 +32,11 @@ from vdsm import constants from vdsm import utils import neterrors as ne -from vdsm import define from vdsm import netinfo from vdsm import libvirtconnection CONNECTIVITY_TIMEOUT_DEFAULT = 4 +DHCP_TIMEOUT_DEFAULT = 120 MAX_VLAN_ID = 4094 MAX_BRIDGE_NAME_LEN = 15 ILLEGAL_BRIDGE_CHARS = frozenset(':. \t') @@ -59,11 +59,13 @@ if not line.endswith(' does not exist!')])) return p.returncode -def ifup(iface): +def ifup(iface, dhcpDone=None): "Bring up an interface" p = subprocess.Popen([constants.EXT_IFUP, iface], stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True) out, err = p.communicate() + if dhcpDone != None: + dhcpDone.set() if out.strip(): logging.info(out) if err.strip(): @@ -774,7 +776,8 @@ def addNetwork(network, vlan=None, bonding=None, nics=None, ipaddr=None, netmask=None, mtu=None, gateway=None, force=False, - configWriter=None, bondingOptions=None, bridged=True, **options): + configWriter=None, bondingOptions=None, bridged=True, + dhcpDone=None, **options): nics = nics or () _netinfo = netinfo.NetInfo() bridged = utils.tobool(bridged) @@ -878,7 +881,7 @@ # wait for dhcp in another thread, # so vdsm won't get stuck (BZ#498940) t = threading.Thread(target=ifup, name='ifup-waiting-on-dhcp', - args=(network,)) + args=(network, dhcpDone)) t.daemon = True t.start() else: @@ -1033,17 +1036,28 @@ def editNetwork(oldBridge, newBridge, vlan=None, bonding=None, nics=None, **options): configWriter = ConfigWriter() + dhcpEvt = None + if newBridge == 'ovirtmgmt' and options.get('bootproto') == 'dhcp' and \ + not utils.tobool(options.get('blockingdhcp')): + dhcpEvt = threading.Event() try: delNetwork(oldBridge, configWriter=configWriter, **options) - addNetwork(newBridge, vlan=vlan, bonding=bonding, nics=nics, configWriter=configWriter, **options) + addNetwork(newBridge, vlan=vlan, bonding=bonding, nics=nics, configWriter=configWriter, + dhcpDone=dhcpEvt, **options) + if utils.tobool(options.get('connectivityCheck', False)): + if dhcpEvt != None: + done = dhcpEvt.wait(DHCP_TIMEOUT_DEFAULT) + dhcpEvt = None + if not done: + raise ConfigNetworkError(ne.ERR_BAD_PARAMS, + 'dhcp client got timeout') + if not clientSeen(int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT))): + delNetwork(newBridge, force=True) + raise ConfigNetworkError(ne.ERR_LOST_CONNECTION, + 'connectivity check failed') except: configWriter.restoreBackups() raise - if utils.tobool(options.get('connectivityCheck', False)): - if not clientSeen(int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT))): - delNetwork(newBridge, force=True) - configWriter.restoreBackups() - return define.errCode['noConPeer']['status']['code'] def _validateNetworkSetup(networks={}, bondings={}): _netinfo = netinfo.NetInfo() @@ -1174,6 +1188,7 @@ _netinfo = netinfo.NetInfo() configWriter = ConfigWriter() networksAdded = set() + dhcpEvt = None # keep set netsWithNewBonds to be able remove # a new added network if connectivity check fail. # If a new network needs to be created on top of existing bond, @@ -1235,11 +1250,21 @@ d['nics'] = [d.pop('nic')] d['force'] = force + if network == 'ovirtmgmt' and d.get('bootproto') == 'dhcp' and \ + not utils.tobool(d.get('blockingdhcp')): + dhcpEvt = threading.Event() + logger.debug("Adding network %r" % network) - addNetwork(network, configWriter=configWriter, + addNetwork(network, configWriter=configWriter, dhcpDone=dhcpEvt, implicitBonding=True, **d) if utils.tobool(options.get('connectivityCheck', True)): + if dhcpEvt != None: + done = dhcpEvt.wait(DHCP_TIMEOUT_DEFAULT) + dhcpEvt = None + if not done: + raise ConfigNetworkError(ne.ERR_BAD_PARAMS, + 'dhcp client got timeout') logger.debug('Checking connectivity...') if not clientSeen(int(options.get('connectivityTimeout', CONNECTIVITY_TIMEOUT_DEFAULT))): -- To view, visit http://gerrit.ovirt.org/7401 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1a1fb8ef4cd88e2144f30cf8dd3f09b8dd8126f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

3 4

Change in vdsm[master]: Remove local mount point if storage server connection fails
by wudxw＠linux.vnet.ibm.com 26 Nov '12

26 Nov '12

Mark Wu has uploaded a new change for review. Change subject: Remove local mount point if storage server connection fails ...................................................................... Remove local mount point if storage server connection fails Change-Id: Ic7aa1a47b7fa3577e83daa82fbad17fdc2ebd51f Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- M vdsm/storage/storageServer.py 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/4298/1 -- To view, visit http://gerrit.ovirt.org/4298 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7aa1a47b7fa3577e83daa82fbad17fdc2ebd51f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mark Wu <wudxw(a)linux.vnet.ibm.com>

4 9

Change in vdsm[master]: [wip] hooks: add the nested virtualization hook
by Federico Simoncelli 26 Nov '12

26 Nov '12

Federico Simoncelli has uploaded a new change for review. Change subject: [wip] hooks: add the nested virtualization hook ...................................................................... [wip] hooks: add the nested virtualization hook If the nested virtualization is enabled in your kvm module this hook will expose it to the guests. Change-Id: I08c24c1b932370577e9687d75e292cd7c40f8e5d Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M configure.ac M vdsm.spec.in M vdsm_hooks/Makefile.am A vdsm_hooks/nestedvt/Makefile.am A vdsm_hooks/nestedvt/before_vm_start.py 5 files changed, 92 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/9225/1 diff --git a/configure.ac b/configure.ac index 5d8b238..bd92fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,7 @@ vdsm_hooks/hugepages/Makefile vdsm_hooks/isolatedprivatevlan/Makefile vdsm_hooks/Makefile + vdsm_hooks/nestedvt/Makefile vdsm_hooks/numa/Makefile vdsm_hooks/pincpu/Makefile vdsm_hooks/promisc/Makefile diff --git a/vdsm.spec.in b/vdsm.spec.in index 5daea0b..47ce21e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -284,6 +284,14 @@ by using <filterref filter='clean-traffic'/> libvirt filter and by adding custom filter: isolatedprivatevlan-vdsm.xml +%package hook-nestedvt +Summary: Nested Virtualization support for VDSM +BuildArch: noarch + +%description hook-nestedvt +If the nested virtualization is enabled in your kvm module +this hook will expose it to the guests. + %package hook-numa Summary: numa sopport for VDSM BuildArch: noarch @@ -853,6 +861,10 @@ %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_isolatedprivatevlan %config(noreplace) %{_sysconfdir}/libvirt/nwfilter/isolatedprivatevlan-vdsm.xml +%files hook-nestedvt +%defattr(-, root, root, -) +%{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_nestedvt + %files hook-numa %defattr(-, root, root, -) %{_libexecdir}/%{vdsm_name}/hooks/before_vm_start/50_numa diff --git a/vdsm_hooks/Makefile.am b/vdsm_hooks/Makefile.am index e6a8280..4ef163a 100644 --- a/vdsm_hooks/Makefile.am +++ b/vdsm_hooks/Makefile.am @@ -31,6 +31,7 @@ hostusb \ hugepages \ isolatedprivatevlan \ + nestedvt \ numa \ pincpu \ promisc \ diff --git a/vdsm_hooks/nestedvt/Makefile.am b/vdsm_hooks/nestedvt/Makefile.am new file mode 100644 index 0000000..b480407 --- /dev/null +++ b/vdsm_hooks/nestedvt/Makefile.am @@ -0,0 +1,32 @@ +# +# Copyright 2012 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +include $(top_srcdir)/build-aux/Makefile.subs + +EXTRA_DIST = \ + before_vm_start.py + +install-data-local: + $(MKDIR_P) $(DESTDIR)$(vdsmhooksdir)/before_vm_start + $(INSTALL_SCRIPT) $(srcdir)/before_vm_start.py \ + $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_nestedvt + +uninstall-local: + $(RM) $(DESTDIR)$(vdsmhooksdir)/before_vm_start/50_nestedvt diff --git a/vdsm_hooks/nestedvt/before_vm_start.py b/vdsm_hooks/nestedvt/before_vm_start.py new file mode 100755 index 0000000..446a487 --- /dev/null +++ b/vdsm_hooks/nestedvt/before_vm_start.py @@ -0,0 +1,46 @@ +#!/usr/bin/python +# +# Copyright 2012 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +import hooking + +cpu_nested_features = { + "kvm_intel": "vmx", + "kvm_amd": "svm", +} + +for kvm_mod in ("kvm_intel", "kvm_amd"): + kvm_mod_path = "/sys/module/%s/parameters/nested" % kvm_mod + try: + with file(kvm_mod_path) as f: + if f.readline().strip() == "Y": + break + except IOError: + pass +else: + kvm_mod = None + +if kvm_mod: + domxml = hooking.read_domxml() + feature_vmx = domxml.createElement("feature") + feature_vmx.setAttribute("name", cpu_nested_features[kvm_mod]) + feature_vmx.setAttribute("policy", "require") + domxml.getElementsByTagName("cpu")[0].appendChild(feature_vmx) + hooking.write_domxml(domxml) -- To view, visit http://gerrit.ovirt.org/9225 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08c24c1b932370577e9687d75e292cd7c40f8e5d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

6 15

Change in vdsm[master]: libvirtev.py: move to site_packages/vdsm
by Dan Kenigsberg 26 Nov '12

26 Nov '12

Dan Kenigsberg has uploaded a new change for review. Change subject: libvirtev.py: move to site_packages/vdsm ...................................................................... libvirtev.py: move to site_packages/vdsm Until we drop this little module, it has to sit within the vdsm package, or else `from vdsm import libvirtconnection` would fail. Change-Id: Ieffbc359880e87a7159906579a18b2e5c63bd763 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm.spec.in M vdsm/Makefile.am 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/9435/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 3fa3395..427db2e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -627,7 +627,6 @@ %{_datadir}/%{vdsm_name}/API.py* %{_datadir}/%{vdsm_name}/hooking.py* %{_datadir}/%{vdsm_name}/hooks.py* -%{_datadir}/%{vdsm_name}/libvirtev.py* %{_datadir}/%{vdsm_name}/libvirtvm.py* %{_datadir}/%{vdsm_name}/lsblk.py* %{_datadir}/%{vdsm_name}/md_utils.py* @@ -786,6 +785,7 @@ %{python_sitearch}/%{vdsm_name}/define.py* %{python_sitearch}/%{vdsm_name}/exception.py* %{python_sitearch}/%{vdsm_name}/libvirtconnection.py* +%{python_sitearch}/%{vdsm_name}/libvirtev.py* %{python_sitearch}/%{vdsm_name}/netinfo.py* %{python_sitearch}/%{vdsm_name}/qemuImg.py* %{python_sitearch}/%{vdsm_name}/SecureXMLRPCServer.py* diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 76a81c6..ceb1eaa 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -36,7 +36,6 @@ hooks.py \ kaxmlrpclib.py \ ksm.py \ - libvirtev.py \ libvirtvm.py \ logUtils.py \ lsblk.py \ @@ -60,6 +59,7 @@ define.py \ exception.py \ libvirtconnection.py \ + libvirtev.py \ netinfo.py \ qemuImg.py \ SecureXMLRPCServer.py \ -- To view, visit http://gerrit.ovirt.org/9435 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieffbc359880e87a7159906579a18b2e5c63bd763 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 13

Change in vdsm[master]: Change paths for RHEV-M 3.0
by Pablo Iranzo Gómez 26 Nov '12

26 Nov '12

Pablo Iranzo Gómez has uploaded a new change for review. Change subject: Change paths for RHEV-M 3.0 ...................................................................... Change paths for RHEV-M 3.0 Change-Id: I07eb1024bd99359de50e0817cc57789eb1ba948a Signed-off-by: Pablo <Pablo.Iranzo(a)gmail.com> --- M contrib/forceVMstart/forceVMstart.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/9477/1 diff --git a/contrib/forceVMstart/forceVMstart.py b/contrib/forceVMstart/forceVMstart.py index 98cf2a2..de25b99 100644 --- a/contrib/forceVMstart/forceVMstart.py +++ b/contrib/forceVMstart/forceVMstart.py @@ -7,9 +7,11 @@ # (at your option) any later version. # # Require Packages: python-iniparse +# # Original script by: Douglas Landgraf (dougsland(a)redhat.com) # Modifications by: Vladik Romanovsky (vromanov(a)redhat.com) - +# Modifications for RHEV 3.0 by: Pablo Iranzo Gomez (Pablo.Iranzo(a)redhat.com) +# import getopt import sys @@ -46,7 +48,7 @@ VDSM_PORT = "54321" #DEBUG MODE -DEBUG = "False" # True or False +DEBUG = "True" # True or False ######################################################################### @@ -217,8 +219,8 @@ # Description: get the vmId from the vmName used as argument # ###################################################################### def getVmId(self, vmName): - path = "/rhev/data-center/%s/vms" % (self.spUUID) - + path = "/rhev/data-center/%s/mastersd/master/vms" % (self.spUUID) + # First verify which domainID contain de XML files try: dirList = os.listdir(path) @@ -278,8 +280,8 @@ # Path to XML files # example default path: # /rhev/data-center/1a516f64-f091-4785-9278-362037513408/vms - path = "/rhev/data-center/%s/vms" % (self.spUUID) - + path = "/rhev/data-center/%s/mastersd/master/vms" % (self.spUUID) + # First verify which domainID contain de XML files try: dirList = os.listdir(path) -- To view, visit http://gerrit.ovirt.org/9477 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07eb1024bd99359de50e0817cc57789eb1ba948a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pablo Iranzo Gómez <Pablo.Iranzo(a)redhat.com>

2 4

Change in vdsm[master]: Fix authors
by Pablo Iranzo Gómez 26 Nov '12

26 Nov '12

Pablo Iranzo Gómez has uploaded a new change for review. Change subject: Fix authors ...................................................................... Fix authors Change-Id: I82a698d4430043f18063b879ee4b7a79a7fbba59 Signed-off-by: Pablo <Pablo.Iranzo(a)gmail.com> --- M contrib/forceVMstart/forceVMstart.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/9476/1 diff --git a/contrib/forceVMstart/forceVMstart.py b/contrib/forceVMstart/forceVMstart.py index 41fe068..98cf2a2 100644 --- a/contrib/forceVMstart/forceVMstart.py +++ b/contrib/forceVMstart/forceVMstart.py @@ -7,6 +7,9 @@ # (at your option) any later version. # # Require Packages: python-iniparse +# Original script by: Douglas Landgraf (dougsland(a)redhat.com) +# Modifications by: Vladik Romanovsky (vromanov(a)redhat.com) + import getopt import sys -- To view, visit http://gerrit.ovirt.org/9476 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82a698d4430043f18063b879ee4b7a79a7fbba59 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Pablo Iranzo Gómez <Pablo.Iranzo(a)redhat.com>

2 4

← Newer
1
...
27
28
29
30
31
32
33
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches November 2012