vdsm-patches September 2013

vdsm-patches@lists.fedorahosted.org

49 participants
443 discussions

Change in vdsm[master]: Avoid re-setting <boot> element when updating nic properties
by Dan Kenigsberg 03 Sep '13

03 Sep '13

Dan Kenigsberg has uploaded a new change for review. Change subject: Avoid re-setting <boot> element when updating nic properties ...................................................................... Avoid re-setting <boot> element when updating nic properties Mentioning <boot> in the vnicxml passed to updateDevice explodes for libvirt < 19.el6. Change-Id: Ib81e1476e3ed31c9b07738cad1e45887f858d842 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M vdsm/vm.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/18796/1 diff --git a/vdsm/vm.py b/vdsm/vm.py index 4e2a696..fc8d3e9 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -3089,6 +3089,8 @@ link = xml.dom.minidom.Element('link') vnicXML.appendChildWithArgs(link) link.setAttribute('state', linkValue) + # drop <boot> element from vnicXML until libvirt rhbz#895294 is solved + vnicXML.firstChild.removeChild(vnicXML.getElementsByTagName('boot')[0]) vnicStrXML = vnicXML.toprettyxml(encoding='utf-8') try: try: -- To view, visit http://gerrit.ovirt.org/18796 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib81e1476e3ed31c9b07738cad1e45887f858d842 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 6

Change in vdsm[master]: Fixing start return the return value of vdsm execution
by ybronhei＠redhat.com 03 Sep '13

03 Sep '13

Yaniv Bronhaim has uploaded a new change for review. Change subject: Fixing start return the return value of vdsm execution ...................................................................... Fixing start return the return value of vdsm execution Change-Id: Ibf04bd53322fc08b0cb8dfa45931ac4eb0c0a25c Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M init/sysvinit/vdsmd.init.in 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/18804/1 diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in index b023fb9..9e96730 100755 --- a/init/sysvinit/vdsmd.init.in +++ b/init/sysvinit/vdsmd.init.in @@ -146,6 +146,7 @@ --daemon --masterpid "${RESPAWNPIDFILE}" "${VDSM_BIN}" --pidfile "${PIDFILE}" RETVAL=$? [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog start" || log_failure_msg $"$prog start" + return "$RETVAL" } stop() { -- To view, visit http://gerrit.ovirt.org/18804 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf04bd53322fc08b0cb8dfa45931ac4eb0c0a25c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

5 6

Change in vdsm[master]: rwtab: Add /var/run/vdsm
by Jenkins CI RO 03 Sep '13

03 Sep '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: rwtab: Add /var/run/vdsm ...................................................................... Patch Set 1: Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4265/ : FAILURE http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3368/ : FAILURE http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4184/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/18829 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I26d15b38cde216eff378fc4095663732302cc8ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <fabiand(a)fedoraproject.org> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No

1 0

Change in vdsm[master]: Adding requires to python-argparse
by ybronhei＠redhat.com 03 Sep '13

03 Sep '13

Yaniv Bronhaim has uploaded a new change for review. Change subject: Adding requires to python-argparse ...................................................................... Adding requires to python-argparse Change-Id: Icf5ae4df4935969a1de87cfc66544da7a3ef3ca5 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/18809/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 1b9a5fe..c3c4b9c 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -96,6 +96,7 @@ Requires: iproute Requires: python-netaddr Requires: python-inotify +Requires: python-argparse Requires: python-ethtool >= 0.6-3 Requires: rpm-python Requires: nfs-utils -- To view, visit http://gerrit.ovirt.org/18809 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf5ae4df4935969a1de87cfc66544da7a3ef3ca5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

4 5

Change in vdsm[master]: Removing has_systemd from sysv script
by ybronhei＠redhat.com 03 Sep '13

03 Sep '13

Yaniv Bronhaim has uploaded a new change for review. Change subject: Removing has_systemd from sysv script ...................................................................... Removing has_systemd from sysv script After separating sysv and systemd common code, there is no need for has_systemd parts in sysv init script, as it doesn't in use at all over systemd. Change-Id: Ief9be5503c84e2cf960e722e5097dbdc05b888a6 Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com> --- M init/sysvinit/vdsmd.init.in 1 file changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/18806/1 diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in index b023fb9..ce6237e 100755 --- a/init/sysvinit/vdsmd.init.in +++ b/init/sysvinit/vdsmd.init.in @@ -150,11 +150,6 @@ stop() { echo $"Shutting down vdsm daemon: " - if has_systemd; then - kill_instance - return 0 - fi - trap cleanup SIGINT SIGHUP SIGTERM if [ -f "$LOCK_FILE" ]; then if ! pidofproc -p "$RESPAWNPIDFILE" >/dev/null; then @@ -207,11 +202,7 @@ case "$1" in start) - if has_systemd; then - start - else - locked_start - fi + locked_start RETVAL=$? ;; stop) @@ -224,7 +215,7 @@ if [ "$RETVAL" -eq 0 ]; then echo "VDS daemon server is running" else - if ! has_systemd && [ -f "$LOCK_FILE" ]; then + if [ -f "$LOCK_FILE" ]; then printf "VDS daemon dead but subsys locked" else printf "VDS daemon is not running" -- To view, visit http://gerrit.ovirt.org/18806 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief9be5503c84e2cf960e722e5097dbdc05b888a6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>

6 12

Change in vdsm[master]: tests : setupNetworks resizeBond, remove param validation.
by gvallare＠redhat.com 03 Sep '13

03 Sep '13

Giuseppe Vallarelli has uploaded a new change for review. Change subject: tests : setupNetworks resizeBond, remove param validation. ...................................................................... tests : setupNetworks resizeBond, remove param validation. Added a couple of tests: * testSetupNetworksResizeBond (functional test). * testValidateNetSetupRemoveParamValidation (unit test). Adding further coverage of setupNetworks and functions on which it depends. Change-Id: I6471a50152314e53e86e9f8e2e1359059fff17f0 Signed-off-by: Giuseppe Vallarelli <gvallare(a)redhat.com> --- M tests/configNetworkTests.py M tests/functional/networkTests.py M tests/functional/utils.py 3 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/17922/1 diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py index 84fad85..9e30400 100644 --- a/tests/configNetworkTests.py +++ b/tests/configNetworkTests.py @@ -163,3 +163,13 @@ # bridgeless network exists self._addNetworkWithExc('test', dict(nics=['eth8'], bridged=False, _netinfo=fakeInfo), neterrors.ERR_BAD_PARAMS) + + @MonkeyPatch(netinfo, 'NetInfo', lambda: None) + def testValidateNetSetupRemoveParamValidation(self): + attrs = dict(nic='dummy', remove=True, + bridged=True) + networks = {'test-netowrk': attrs} + with self.assertRaises(neterrors.ConfigNetworkError) as cneContext: + configNetwork._validateNetworkSetup(networks, {}) + self.assertEqual(cneContext.exception.errCode, + neterrors.ERR_BAD_PARAMS) diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py index 2b0758d..86b67e6 100644 --- a/tests/functional/networkTests.py +++ b/tests/functional/networkTests.py @@ -445,3 +445,43 @@ {}) self.assertEquals(status, SUCCESS, msg) + + @permutations([[True], [False]]) + @RequireDummyMod + @ValidateRunningAsRoot + def testSetupNetworksResizeBond(self, bridged): + with dummyIf(3) as nics: + with self.vdsm_net.pinger(): + bondings = {BONDING_NAME: dict(nics=nics[:1], + bridged=bridged)} + status, msg = self.vdsm_net.setupNetworks({}, bondings, {}) + + self.assertEquals(status, SUCCESS, msg) + + self.vdsm_net.bondExists(BONDING_NAME, nics=nics[:1]) + + # Increase bond size + bondings[BONDING_NAME]['nics'] = nics + status, msg = self.vdsm_net.setupNetworks({}, bondings, {}) + + self.assertEquals(status, SUCCESS, msg) + + self.vdsm_net.bondExists(BONDING_NAME, nics) + + # Reduce bond size + reqmode = '3' + bondings[BONDING_NAME]['nics'] = nics[:2] + bondings[BONDING_NAME]['options'] = 'mode=%s' % reqmode + status, msg = self.vdsm_net.setupNetworks({}, bondings, {}) + + self.assertEquals(status, SUCCESS, msg) + + self.vdsm_net.bondExists(BONDING_NAME, nics[:2]) + # TODO + # self.assertEquals(self.vdsm_net.getBondMode(BONDING_NAME), + # reqmode) + + bondings = {BONDING_NAME: dict(remove=True)} + status, msg = self.vdsm_net.setupNetworks({}, bondings, {}) + + self.assertEquals(status, SUCCESS, msg) diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 8cb995c..6dc96e1 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -207,6 +207,10 @@ return self.netinfo.nics[name]['mtu'] return None + # TODO Add impl. + def getBondMode(self, bond): + pass + @contextmanager def pinger(self): """Keeps pinging vdsm for operations that need it""" -- To view, visit http://gerrit.ovirt.org/17922 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6471a50152314e53e86e9f8e2e1359059fff17f0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Giuseppe Vallarelli <gvallare(a)redhat.com>

3 13

Change in vdsm[master]: vm: new parameter 'protected' for vm creation
by Federico Simoncelli 03 Sep '13

03 Sep '13

Federico Simoncelli has uploaded a new change for review. Change subject: vm: new parameter 'protected' for vm creation ...................................................................... vm: new parameter 'protected' for vm creation Setting the new parameter 'protected' to true when creating a VM enables sanlock protection for the VM resources (disks). As a result few operations on the VM are blocked as they're not supported yet. Change-Id: I9429ead45caac1178957a33393642817db59508f Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M client/vdsClient.py M vdsm/storage/hsm.py M vdsm/vm.py M vdsm_api/vdsmapi-schema.json 4 files changed, 45 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/17714/1 diff --git a/client/vdsClient.py b/client/vdsClient.py index c52256a..c65531c 100644 --- a/client/vdsClient.py +++ b/client/vdsClient.py @@ -1822,7 +1822,9 @@ 'name:val}]} : add a fully specified device', 'o cpuPinning={vcpuid:pinning} cpu pinning in ' 'libvirt-like format. see ' - 'http://libvirt.org/formatdomain.html#elementsCPUTuning' + 'http://libvirt.org/formatdomain.html#elementsCPUTuning', + 'o protected=<true/false> whether the vm resources ' + '(disks) should be protected using sanlock', )), 'vmUpdateDevice': (serv.vmUpdateDevice, ('<vmId> <devicespec>', diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index c754ee8..2112693 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3235,17 +3235,16 @@ 'volumeID': vol.volUUID, 'path': vol.getVolumePath(), 'vmVolInfo': vol.getVmVolumeInfo()} - if config.getboolean('irs', 'use_volume_leases'): - leasePath, leaseOffset = dom.getVolumeLease(vol.imgUUID, - vol.volUUID) + leasePath, leaseOffset = \ + dom.getVolumeLease(vol.imgUUID, vol.volUUID) - if leasePath and leaseOffset is not None: - volInfo.update({ - 'leasePath': leasePath, - 'leaseOffset': leaseOffset, - 'shared': (vol.getVolType() == - volume.type2name(volume.SHARED_VOL)), - }) + if leasePath and leaseOffset is not None: + volInfo.update({ + 'leasePath': leasePath, + 'leaseOffset': leaseOffset, + 'shared': (vol.getVolType() == + volume.type2name(volume.SHARED_VOL)), + }) chain.append(volInfo) diff --git a/vdsm/vm.py b/vdsm/vm.py index dc52909..1b86eb7 100644 --- a/vdsm/vm.py +++ b/vdsm/vm.py @@ -2073,6 +2073,9 @@ def isDisksStatsCollectionEnabled(self): return self._volumesPrepared + def isProtected(self): + return utils.tobool(self.conf.get('protected', 'false')) + def preparePaths(self, drives): domains = set() for drive in drives: @@ -2685,21 +2688,19 @@ self._appendDevices(domxml) - for drive in self._devices[DISK_DEVICES][:]: - if not hasattr(drive, 'volumeChain'): - continue + if (config.getboolean('irs', 'use_volume_leases') + or self.isProtected()): - for volInfo in drive.volumeChain: - if ('leasePath' not in volInfo or - 'leaseOffset' not in volInfo or - volInfo['shared']): + for drive in self._devices[DISK_DEVICES][:]: + if not hasattr(drive, 'volumeChain'): continue - leaseElem = self._buildLease( - drive.domainID, volInfo['volumeID'], volInfo['leasePath'], - volInfo['leaseOffset']) + for volInfo in drive.volumeChain: + leaseElem = self._buildLease( + drive.domainID, volInfo['volumeID'], + volInfo['leasePath'], volInfo['leaseOffset']) - domxml._devices.appendChild(leaseElem) + domxml._devices.appendChild(leaseElem) return domxml.toxml() @@ -3224,6 +3225,9 @@ return {'status': doneCode, 'vmList': self.status()} def hotplugDisk(self, params): + if self.isProtected(): + return errCode['noimpl'] + if self.isMigrating(): return errCode['migInProgress'] @@ -3271,6 +3275,9 @@ return {'status': doneCode, 'vmList': self.status()} def hotunplugDisk(self, params): + if self.isProtected(): + return errCode['noimpl'] + if self.isMigrating(): return errCode['migInProgress'] @@ -3551,6 +3558,9 @@ disks = xml.dom.minidom.Element('disks') newDrives = {} + if self.isProtected(): + return errCode['noimpl'] + if self.isMigrating(): return errCode['migInProgress'] @@ -3726,6 +3736,9 @@ def merge(self, mergeDrives): """Live merge command""" + if self.isProtected(): + return errCode['noimpl'] + # Check if there is a merge still in progress for mergeStatus in self.conf.get('liveMerge', []): if mergeStatus['status'] == MERGESTATUS.IN_PROGRESS: @@ -3834,6 +3847,9 @@ del srcDrive.diskReplicate def diskReplicateStart(self, srcDisk, dstDisk): + if self.isProtected(): + return errCode['noimpl'] + try: srcDrive = self._findDriveByUUIDs(srcDisk) except LookupError: @@ -3882,6 +3898,9 @@ return {'status': doneCode} def diskReplicateFinish(self, srcDisk, dstDisk): + if self.isProtected(): + return errCode['noimpl'] + try: srcDrive = self._findDriveByUUIDs(srcDisk) except LookupError: diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 4495dc5..8a9d325 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2717,6 +2717,9 @@ # # @nice: The host scheduling priority # +# @protected: Whether the VM resources must be protected using +# sanlock or not +# # @smp: The number of CPUs presented to the VM # # @smpCoresPerSocket: #optional Indicates the number of CPU cores per socket -- To view, visit http://gerrit.ovirt.org/17714 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9429ead45caac1178957a33393642817db59508f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

7 28

Change in vdsm[master]: Add vdsm upstart jobs
by zhshzhou＠linux.vnet.ibm.com 02 Sep '13

02 Sep '13

Zhou Zheng Sheng has uploaded a new change for review. Change subject: Add vdsm upstart jobs ...................................................................... Add vdsm upstart jobs Add Upstart jobs for vdsmd, supervdsmd, vdsm-restore-net-config, vdsm-tmpfiles. vdsmd, supervdsmd, vdsm-restore-net-config jobs are Upstart counterpart of vdsmd.service, supervdsmd.service and vdsm-restore-net-config.service in systemd. vdsm-tmpfiles is to create directories under /var/run/ for vdsm and supervdsm. In Upstart there is no systemd-tmpfiles.sercice equivalent, so we implement simple script in vdsm-tmpfiles to do the necessary job. Change-Id: Id68ec0197bd1e09100f5da96ac4db24f2b90753a Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M .gitignore M vdsm/Makefile.am A vdsm/supervdsmd.upstart.in A vdsm/vdsm-restore-net-config.upstart.in A vdsm/vdsm-tmpfiles.upstart.in A vdsm/vdsmd.upstart.in 6 files changed, 96 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/17812/1 diff --git a/.gitignore b/.gitignore index 7802279..232a7bf 100644 --- a/.gitignore +++ b/.gitignore @@ -45,18 +45,22 @@ vdsm/storage/12-vdsm-lvm.rules vdsm/storage/protect/safelease vdsm/sudoers.vdsm +vdsm/supervdsmd.upstart vdsm/svdsm.logger.conf vdsm/vdscli.py vdsm/vdsm-gencerts.sh vdsm/vdsm-logrotate.conf vdsm/vdsm-restore-net-config.init +vdsm/vdsm-restore-net-config.upstart vdsm/vdsm-sosplugin.py vdsm/vdsm-store-net-config vdsm/vdsm-tmpfiles.d.conf +vdsm/vdsm-tmpfiles.upstart vdsm/vdsm.rwtab vdsm/vdsmd.8 vdsm/vdsmd.init vdsm/vdsmd.service +vdsm/vdsmd.upstart vdsm/vdsmd_init_common.sh vdsm/supervdsmd.init vdsm/supervdsmd.service diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index ba403da..feb6113 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -78,13 +78,17 @@ sudoers.vdsm \ supervdsmd.init \ supervdsmd.service \ + supervdsmd.upstart \ svdsm.logger.conf \ vdsm-logrotate.conf \ vdsm-restore-net-config.init \ + vdsm-restore-net-config.upstart \ vdsm-tmpfiles.d.conf \ + vdsm-tmpfiles.upstart \ vdsm.rwtab \ vdsmd.init \ vdsmd.service \ + vdsmd.upstart \ $(NULL) dist_vdsm_SCRIPTS = \ @@ -127,6 +131,7 @@ sudoers.vdsm.in \ supervdsmd.init.in \ supervdsmd.service.in \ + supervdsmd.upstart.in \ svdsm.logger.conf.in \ vdsm-gencerts.sh.in \ vdsm-libvirt-access.pkla \ @@ -137,13 +142,16 @@ vdsm-modules-load.d.conf \ vdsm-restore-net-config.init.in \ vdsm-restore-net-config.service \ + vdsm-restore-net-config.upstart.in \ vdsm-store-net-config.in \ vdsm-sysctl.conf \ vdsm-tmpfiles.d.conf.in \ + vdsm-tmpfiles.upstart.in \ vdsm.rwtab.in \ vdsmd.8.in \ vdsmd.init.in \ vdsmd.service.in \ + vdsmd.upstart.in \ vdsmd_init_common.sh.in \ $(NULL) diff --git a/vdsm/supervdsmd.upstart.in b/vdsm/supervdsmd.upstart.in new file mode 100644 index 0000000..a076493 --- /dev/null +++ b/vdsm/supervdsmd.upstart.in @@ -0,0 +1,20 @@ +# supervdsmd - Auxiliary vdsm service for running helper functions as root +# + +description "Auxiliary vdsm service for running helper functions as root" + +start on runlevel [2345] +stop on runlevel [!2345] or stopping libvirt-bin +chdir "@VDSMDIR@" +console log +respawn + +# All commands called inside this script section except the daemon itself +# should not fork, otherwise Upstart traces the wrong pid. +# ".", "[", "&&" are built-in command or key-word, no fork. +# bash exec does not fork, just execve the target binary. +# So no "expect" stanza is needed. +script + [ -f "/etc/default/supervdsmd" ] && . "/etc/default/supervdsmd" + exec "@VDSMDIR@/daemonAdapter" "@VDSMDIR@/supervdsmServer" --sockfile "@VDSMRUNDIR@/svdsm.sock" +end script diff --git a/vdsm/vdsm-restore-net-config.upstart.in b/vdsm/vdsm-restore-net-config.upstart.in new file mode 100644 index 0000000..a18e67f --- /dev/null +++ b/vdsm/vdsm-restore-net-config.upstart.in @@ -0,0 +1,12 @@ +# vdsm-restore-net-config - Restore failed Vdsm network configuration on boot +# + +description "Restore failed Vdsm network configuration on boot" + +start on runlevel [2345] and started libvirt-bin +chdir "@VDSMDIR@" +console log + +task + +exec "@VDSMDIR@/vdsm-restore-net-config" diff --git a/vdsm/vdsm-tmpfiles.upstart.in b/vdsm/vdsm-tmpfiles.upstart.in new file mode 100644 index 0000000..426192f --- /dev/null +++ b/vdsm/vdsm-tmpfiles.upstart.in @@ -0,0 +1,24 @@ +# vdsm-tmpfiles - Automatically create tempfiles under /var/run for vdsm +# + +description "Automatically create tempfiles under /var/run for vdsm" + +start on startup +console log + +task + +script +while read Type Path Mode User Group ; do + if [ ! -e "$Path" ]; then + if [ "$Type" = "d" ]; then + @MKDIR_P@ "$Path" + else + echo "Type $Type handling is not implemented" + exit 1 + fi + fi + "@CHOWN_PATH@" $User:$Group "$Path" + "@CHMOD_PATH@" $Mode "$Path" +done < "@VDSMDIR@/vdsm-tmpfiles.d.conf" +end script diff --git a/vdsm/vdsmd.upstart.in b/vdsm/vdsmd.upstart.in new file mode 100644 index 0000000..ab0da59 --- /dev/null +++ b/vdsm/vdsmd.upstart.in @@ -0,0 +1,28 @@ +# vdsmd - Virtual Desktop Server Manager +# + +description "Virtual Desktop Server Manager" + +start on runlevel [2345] +stop on runlevel [!2345] or stopping networking or stopping portmap or stopping libvirt-bin or stopping supervdsmd +chdir "@VDSMDIR@" +console log +nice -20 +respawn + +pre-start script + "@LIBEXECDIR@/vdsmd_init_common.sh" --start-needed-srv "ntp open-iscsi multipath-tools wdmd sanlock portmap libvirt-bin supervdsmd" + "@LIBEXECDIR@/vdsmd_init_common.sh" --pre-start +end script + +# All commands called inside this script section except the daemon itself +# should not fork, otherwise Upstart traces the wrong pid. +# ".", "[", "&&" are built-in command or key-word, no fork. +# bash exec does not fork, just execve the target binary. +# So no "expect" stanza is needed. +script + [ -f "/etc/default/vdsmd" ] && . "/etc/default/vdsmd" + exec start-stop-daemon --chuid @VDSMUSER@:@VDSMGROUP@ --start --exec "@VDSMDIR@/daemonAdapter" -- -c /dev/null "@VDSMDIR@/vdsm" +end script + +post-stop exec "@LIBEXECDIR@/vdsmd_init_common.sh" --post-stop -- To view, visit http://gerrit.ovirt.org/17812 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id68ec0197bd1e09100f5da96ac4db24f2b90753a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

6 27

Change in vdsm[master]: vdsm: Add tuneBlockDevIo interface
by Federico Simoncelli 02 Sep '13

02 Sep '13

Federico Simoncelli has posted comments on this change. Change subject: vdsm: Add tuneBlockDevIo interface ...................................................................... Patch Set 14: Code-Review-1 (3 comments) .................................................... File vdsm/vm.py Line 4326: # persist the target value to make it consistent after recovery Line 4327: self.saveState() Line 4328: return {'status': doneCode} Line 4329: Line 4330: def _getTuneBlkDevIoInfo(self): This might be useless. More info below. Line 4331: # Only tuned disk IO information is returned. Line 4332: results = {} Line 4333: for device in self.conf['devices']: Line 4334: if device.get('device') == 'disk' and device.get('name'): Line 4350: invalidParamNames = ', '.join(invalidParams) Line 4351: raise ValueError('Parameter %s name(s) are invalid' % Line 4352: invalidParamNames) Line 4353: Line 4354: def _checkIoTuneCategories(self, params): I am not a big fan of checks re-writes. If this is already checked by libvirt then let's just wait for it to fail when we call setBlockIoTune. Line 4355: categories = ("bytes", "iops") Line 4356: for category in categories: Line 4357: if params.get('total_' + category + '_sec', 0) and \ Line 4358: (params.get('read_' + category + '_sec', 0) or Line 4406: errMsg = 'Get new block I/O Tune params failed after setting' Line 4407: self.log.exception(errMsg) Line 4408: return getErrCode('tuneBlkDevIoErr', errMsg) Line 4409: else: Line 4410: for device in self.conf['devices']: I'm not sure I like this because if we crash between setBlockIoTune and saveState loop we basically lose this information. Best thing here would probably be add blockIoTune in the vm stats thread (and forget about persisting these values). Therefore _getTuneBlkDevIoInfo might be useless and could be removed. Line 4411: if device.get('name') == dev or device.get('path') == dev: Line 4412: device.setdefault('specParams', {}) Line 4413: device['specParams']['ioTune'] = info Line 4414: -- To view, visit http://gerrit.ovirt.org/14394 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icb33510a081d221af0f69d4dd2d55adf0b79efd2 Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com> Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: packaging: split vdsm hook .deb from vdsm main .deb
by zhshzhou＠linux.vnet.ibm.com 02 Sep '13

02 Sep '13

Zhou Zheng Sheng has uploaded a new change for review. Change subject: packaging: split vdsm hook .deb from vdsm main .deb ...................................................................... packaging: split vdsm hook .deb from vdsm main .deb Create debian/vdsm-hook-HookName.install to describe file in the respective vdsm hook .deb files. Delete the related entries from the vdsm.install. Change-Id: Ia1a34cbb08e0497c60d721f0a0c965aae5493033 Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- M debian/control M debian/rules A debian/vdsm-hook-checkimages.docs A debian/vdsm-hook-checkimages.install A debian/vdsm-hook-directlun.docs A debian/vdsm-hook-directlun.install A debian/vdsm-hook-faqemu.docs A debian/vdsm-hook-faqemu.install A debian/vdsm-hook-fileinject.docs A debian/vdsm-hook-fileinject.install A debian/vdsm-hook-floppy.docs A debian/vdsm-hook-floppy.install A debian/vdsm-hook-hostusb.docs A debian/vdsm-hook-hostusb.install A debian/vdsm-hook-hugepages.docs A debian/vdsm-hook-hugepages.install A debian/vdsm-hook-isolatedprivatevlan.docs A debian/vdsm-hook-isolatedprivatevlan.install A debian/vdsm-hook-macspoof.docs A debian/vdsm-hook-macspoof.install A debian/vdsm-hook-nestedvt.docs A debian/vdsm-hook-nestedvt.install A debian/vdsm-hook-numa.docs A debian/vdsm-hook-numa.install A debian/vdsm-hook-openstacknet.docs A debian/vdsm-hook-openstacknet.install A debian/vdsm-hook-pincpu.docs A debian/vdsm-hook-pincpu.install A debian/vdsm-hook-promisc.docs A debian/vdsm-hook-promisc.install A debian/vdsm-hook-qemucmdline.docs A debian/vdsm-hook-qemucmdline.install A debian/vdsm-hook-qos.docs A debian/vdsm-hook-qos.install A debian/vdsm-hook-scratchpad.docs A debian/vdsm-hook-scratchpad.install A debian/vdsm-hook-smbios.docs A debian/vdsm-hook-smbios.install A debian/vdsm-hook-sriov.docs A debian/vdsm-hook-sriov.install A debian/vdsm-hook-vhostmd.docs A debian/vdsm-hook-vhostmd.install A debian/vdsm-hook-vmdisk.docs A debian/vdsm-hook-vmdisk.install A debian/vdsm-hook-vmfex.docs A debian/vdsm-hook-vmfex.install M debian/vdsm.install 47 files changed, 237 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/18720/1 diff --git a/debian/control b/debian/control index 10e4f36..792b03e 100644 --- a/debian/control +++ b/debian/control @@ -23,3 +23,159 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}), python-nose Description: Unit and functional tests for vdsm A test suite for verifying the functionality of a running vdsm instance + +Package: vdsm-hook-checkimages +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Qcow2 disk image format check hook for VDSM + VDSM hook used to perform consistency check on a qcow2 format disk image + using the QEMU disk image utility. + +Package: vdsm-hook-vhostmd +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: VDSM hook set for interaction with vhostmd + VDSM hook to use vhostmd per VM according to Virtualization Manager requests. + +Package: vdsm-hook-faqemu +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Fake qemu process for VDSM quality assurance + VDSM hook used for testing VDSM with multiple fake virtual machines without + running real guests. + To enable this hook on your host, set vars.fake_kvm_support=True in your + /etc/vdsm/vdsm.conf before adding the host to ovirt-Engine. + +Package: vdsm-hook-directlun +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Direct LUN support for VDSM + VDSM hook enable user to add storage LUN for VDSM + without the sharing and storage handling of VDSM. + +Package: vdsm-hook-macspoof +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Disables MAC spoofing filtering + VDSM hooks which allow to disable mac spoof filtering + either on all the of the VM's interfaces or on + specific vnics. + +Package: vdsm-hook-fileinject +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}), python-libguestfs +Description: Allow uploading file to VMs disk + Hook is getting target file name and its content and + create that file in target machine. + +Package: vdsm-hook-floppy +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Allow adding floppy to VM + Allow adding floppy to VM + +Package: vdsm-hook-hostusb +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}), usbutils +Description: Allow attaching USB device from host + Hook is getting vendor and product id of USB device + disconnect it from host and attach it to VM + +Package: vdsm-hook-hugepages +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Huge pages enable user to handle VM with 2048KB page files. + Hook is getting number of huge pages reserve them for the VM, + and enable user to handle VM with 2048KB page files. + +Package: vdsm-hook-isolatedprivatevlan +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Isolated network environment for VMs + limit VM traffic to a specific gateway by its mac address, + hook prevent VM from spoofing its mac or ip address + by using <filterref filter='clean-traffic'/> libvirt filter + and by adding custom filter: isolatedprivatevlan-vdsm.xml + +Package: vdsm-hook-nestedvt +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Nested Virtualization support for VDSM + If the nested virtualization is enabled in your kvm module + this hook will expose it to the guests. + +Package: vdsm-hook-numa +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: NUMA support for VDSM + Hooks is getting number/rage of NUMA nodes and NUMA mode, + and update the VM xml. + +Package: vdsm-hook-openstacknet +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: OpenStack Network vNICs support for VDSM + Hook for OpenStack Network vNICs. + +Package: vdsm-hook-pincpu +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Hook pin VM so specific CPUs + pincpu is hook for VDSM. + pincpu enable to pin virtual machine to a specific CPUs. + +Package: vdsm-hook-promisc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Network interface promiscuous mode support for VDSM + VDSM promiscuous mode let user define a VM interface that will capture + all network traffic. + +Package: vdsm-hook-qemucmdline +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: QEMU cmdline hook for VDSM + Provides support for injecting QEMU cmdline via VDSM hook. + It exploits libvirt's qemu:commandline facility available in the + qemu xml namespace. + +Package: vdsm-hook-qos +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: QoS network in/out traffic support for VDSM + Hook adds QoS in/out traffic to VMs interfaces + +Package: vdsm-hook-scratchpad +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: One time disk creation for VDSM + scratchpad hook for VDSM + Hook creates a disk for a VM onetime usage, + the disk will be erased when the VM destroyed. + VM cannot be migrated when using scratchpad hook + +Package: vdsm-hook-smbios +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: Adding custom smbios entries to libvirt domain via VDSM + Adding custom smbios entries to libvirt domain via VDSM + such as: vendor, version, date and release + +Package: vdsm-hook-sriov +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}), libvirt-bin (>= 1.0.2-1) +Description: sr-iov support for VDSM + sr-iov hook enable to add virtual functions exposed by the device + directly to a virtual machine. + +Package: vdsm-hook-vmfex +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: vmfex support for VDSM + Hook for vmfex. + +Package: vdsm-hook-vmdisk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.4), vdsm (= ${binary:Version}) +Description: External disk support for VDSM + Hook adds additional disk image for a VM (raw or qcow2) diff --git a/debian/rules b/debian/rules index 6b7ffd7..786d2e3 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ override_dh_auto_configure: autoreconf -if - dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib --libexecdir=/usr/libexec + dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib --libexecdir=/usr/libexec --enable-hooks destdir = debian/vdsm diff --git a/debian/vdsm-hook-checkimages.docs b/debian/vdsm-hook-checkimages.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-checkimages.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-checkimages.install b/debian/vdsm-hook-checkimages.install new file mode 100644 index 0000000..d51ef7e --- /dev/null +++ b/debian/vdsm-hook-checkimages.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/60_checkimages diff --git a/debian/vdsm-hook-directlun.docs b/debian/vdsm-hook-directlun.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-directlun.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-directlun.install b/debian/vdsm-hook-directlun.install new file mode 100644 index 0000000..8454506 --- /dev/null +++ b/debian/vdsm-hook-directlun.install @@ -0,0 +1,4 @@ +etc/sudoers.d/50_vdsm_hook_directlun +usr/libexec/vdsm/hooks/before_vm_start/50_directlun +usr/libexec/vdsm/hooks/after_vm_destroy/50_directlun +usr/libexec/vdsm/hooks/before_vm_migrate_destination/50_directlun diff --git a/debian/vdsm-hook-faqemu.docs b/debian/vdsm-hook-faqemu.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-faqemu.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-faqemu.install b/debian/vdsm-hook-faqemu.install new file mode 100644 index 0000000..578d1e4 --- /dev/null +++ b/debian/vdsm-hook-faqemu.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/10_faqemu diff --git a/debian/vdsm-hook-fileinject.docs b/debian/vdsm-hook-fileinject.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-fileinject.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-fileinject.install b/debian/vdsm-hook-fileinject.install new file mode 100644 index 0000000..9cc3bbd --- /dev/null +++ b/debian/vdsm-hook-fileinject.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_fileinject diff --git a/debian/vdsm-hook-floppy.docs b/debian/vdsm-hook-floppy.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-floppy.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-floppy.install b/debian/vdsm-hook-floppy.install new file mode 100644 index 0000000..d491e04 --- /dev/null +++ b/debian/vdsm-hook-floppy.install @@ -0,0 +1,2 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_floppy +usr/libexec/vdsm/hooks/before_vm_migrate_source/50_floppy diff --git a/debian/vdsm-hook-hostusb.docs b/debian/vdsm-hook-hostusb.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-hostusb.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-hostusb.install b/debian/vdsm-hook-hostusb.install new file mode 100644 index 0000000..362b7fc --- /dev/null +++ b/debian/vdsm-hook-hostusb.install @@ -0,0 +1,4 @@ +etc/sudoers.d/50_vdsm_hook_hostusb +usr/libexec/vdsm/hooks/before_vm_start/50_hostusb +usr/libexec/vdsm/hooks/before_vm_migrate_source/50_hostusb +usr/libexec/vdsm/hooks/after_vm_destroy/50_hostusb diff --git a/debian/vdsm-hook-hugepages.docs b/debian/vdsm-hook-hugepages.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-hugepages.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-hugepages.install b/debian/vdsm-hook-hugepages.install new file mode 100644 index 0000000..4c6ecaf --- /dev/null +++ b/debian/vdsm-hook-hugepages.install @@ -0,0 +1,4 @@ +etc/sudoers.d/50_vdsm_hook_hugepages +usr/libexec/vdsm/hooks/before_vm_start/50_hugepages +usr/libexec/vdsm/hooks/before_vm_migrate_destination/50_hugepages +usr/libexec/vdsm/hooks/after_vm_destroy/50_hugepages diff --git a/debian/vdsm-hook-isolatedprivatevlan.docs b/debian/vdsm-hook-isolatedprivatevlan.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-isolatedprivatevlan.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-isolatedprivatevlan.install b/debian/vdsm-hook-isolatedprivatevlan.install new file mode 100644 index 0000000..ed5a5a8 --- /dev/null +++ b/debian/vdsm-hook-isolatedprivatevlan.install @@ -0,0 +1,2 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_isolatedprivatevlan +etc/libvirt/nwfilter/isolatedprivatevlan-vdsm.xml diff --git a/debian/vdsm-hook-macspoof.docs b/debian/vdsm-hook-macspoof.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-macspoof.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-macspoof.install b/debian/vdsm-hook-macspoof.install new file mode 100644 index 0000000..4adb416 --- /dev/null +++ b/debian/vdsm-hook-macspoof.install @@ -0,0 +1,3 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_macspoof +usr/libexec/vdsm/hooks/before_device_create/50_macspoof +usr/libexec/vdsm/hooks/before_nic_hotplug/50_macspoof diff --git a/debian/vdsm-hook-nestedvt.docs b/debian/vdsm-hook-nestedvt.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-nestedvt.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-nestedvt.install b/debian/vdsm-hook-nestedvt.install new file mode 100644 index 0000000..a281dfa --- /dev/null +++ b/debian/vdsm-hook-nestedvt.install @@ -0,0 +1,2 @@ +etc/modprobe.d/vdsm-nestedvt.conf +usr/libexec/vdsm/hooks/before_vm_start/50_nestedvt diff --git a/debian/vdsm-hook-numa.docs b/debian/vdsm-hook-numa.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-numa.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-numa.install b/debian/vdsm-hook-numa.install new file mode 100644 index 0000000..7fde240 --- /dev/null +++ b/debian/vdsm-hook-numa.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_numa diff --git a/debian/vdsm-hook-openstacknet.docs b/debian/vdsm-hook-openstacknet.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-openstacknet.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-openstacknet.install b/debian/vdsm-hook-openstacknet.install new file mode 100644 index 0000000..a23dce8 --- /dev/null +++ b/debian/vdsm-hook-openstacknet.install @@ -0,0 +1,11 @@ +etc/sudoers.d/50_vdsm_hook_openstacknet +usr/libexec/vdsm/hooks/after_device_create/50_openstacknet +usr/libexec/vdsm/hooks/after_device_create/openstacknet_consts.py +usr/libexec/vdsm/hooks/after_device_migrate_destination/50_openstacknet +usr/libexec/vdsm/hooks/after_device_migrate_destination/openstacknet_consts.py +usr/libexec/vdsm/hooks/after_nic_hotplug/50_openstacknet +usr/libexec/vdsm/hooks/after_nic_hotplug/openstacknet_consts.py +usr/libexec/vdsm/hooks/before_device_create/50_openstacknet +usr/libexec/vdsm/hooks/before_device_create/openstacknet_consts.py +usr/libexec/vdsm/hooks/before_nic_hotplug/50_openstacknet +usr/libexec/vdsm/hooks/before_nic_hotplug/openstacknet_consts.py diff --git a/debian/vdsm-hook-pincpu.docs b/debian/vdsm-hook-pincpu.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-pincpu.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-pincpu.install b/debian/vdsm-hook-pincpu.install new file mode 100644 index 0000000..59ebbe7 --- /dev/null +++ b/debian/vdsm-hook-pincpu.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_pincpu diff --git a/debian/vdsm-hook-promisc.docs b/debian/vdsm-hook-promisc.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-promisc.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-promisc.install b/debian/vdsm-hook-promisc.install new file mode 100644 index 0000000..985a7d7 --- /dev/null +++ b/debian/vdsm-hook-promisc.install @@ -0,0 +1,3 @@ +etc/sudoers.d/50_vdsm_hook_promisc +usr/libexec/vdsm/hooks/after_vm_start/50_promisc +usr/libexec/vdsm/hooks/before_vm_destroy/50_promisc diff --git a/debian/vdsm-hook-qemucmdline.docs b/debian/vdsm-hook-qemucmdline.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-qemucmdline.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-qemucmdline.install b/debian/vdsm-hook-qemucmdline.install new file mode 100644 index 0000000..80e2265 --- /dev/null +++ b/debian/vdsm-hook-qemucmdline.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_qemucmdline diff --git a/debian/vdsm-hook-qos.docs b/debian/vdsm-hook-qos.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-qos.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-qos.install b/debian/vdsm-hook-qos.install new file mode 100644 index 0000000..2ce7c26 --- /dev/null +++ b/debian/vdsm-hook-qos.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_qos diff --git a/debian/vdsm-hook-scratchpad.docs b/debian/vdsm-hook-scratchpad.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-scratchpad.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-scratchpad.install b/debian/vdsm-hook-scratchpad.install new file mode 100644 index 0000000..3192f09 --- /dev/null +++ b/debian/vdsm-hook-scratchpad.install @@ -0,0 +1,3 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_scratchpad +usr/libexec/vdsm/hooks/before_vm_migrate_source/50_scratchpad +usr/libexec/vdsm/hooks/after_vm_destroy/50_scratchpad diff --git a/debian/vdsm-hook-smbios.docs b/debian/vdsm-hook-smbios.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-smbios.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-smbios.install b/debian/vdsm-hook-smbios.install new file mode 100644 index 0000000..12ae527 --- /dev/null +++ b/debian/vdsm-hook-smbios.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_smbios diff --git a/debian/vdsm-hook-sriov.docs b/debian/vdsm-hook-sriov.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-sriov.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-sriov.install b/debian/vdsm-hook-sriov.install new file mode 100644 index 0000000..e8a0ba2 --- /dev/null +++ b/debian/vdsm-hook-sriov.install @@ -0,0 +1,4 @@ +etc/sudoers.d/50_vdsm_hook_sriov +usr/libexec/vdsm/hooks/before_vm_start/50_sriov +usr/libexec/vdsm/hooks/after_vm_destroy/50_sriov +usr/libexec/vdsm/hooks/before_vm_migrate_source/50_sriov diff --git a/debian/vdsm-hook-vhostmd.docs b/debian/vdsm-hook-vhostmd.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-vhostmd.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-vhostmd.install b/debian/vdsm-hook-vhostmd.install new file mode 100644 index 0000000..3acf28b --- /dev/null +++ b/debian/vdsm-hook-vhostmd.install @@ -0,0 +1,5 @@ +etc/sudoers.d/50_vdsm_hook_vhostmd +usr/libexec/vdsm/hooks/before_vm_start/50_vhostmd +usr/libexec/vdsm/hooks/before_vm_migrate_destination/50_vhostmd +usr/libexec/vdsm/hooks/before_vm_dehibernate/50_vhostmd +usr/libexec/vdsm/hooks/after_vm_destroy/50_vhostmd diff --git a/debian/vdsm-hook-vmdisk.docs b/debian/vdsm-hook-vmdisk.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-vmdisk.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-vmdisk.install b/debian/vdsm-hook-vmdisk.install new file mode 100644 index 0000000..27c3a86 --- /dev/null +++ b/debian/vdsm-hook-vmdisk.install @@ -0,0 +1 @@ +usr/libexec/vdsm/hooks/before_vm_start/50_vmdisk diff --git a/debian/vdsm-hook-vmfex.docs b/debian/vdsm-hook-vmfex.docs new file mode 100644 index 0000000..5ecd9c6 --- /dev/null +++ b/debian/vdsm-hook-vmfex.docs @@ -0,0 +1 @@ +COPYING diff --git a/debian/vdsm-hook-vmfex.install b/debian/vdsm-hook-vmfex.install new file mode 100644 index 0000000..70e03ce --- /dev/null +++ b/debian/vdsm-hook-vmfex.install @@ -0,0 +1,2 @@ +usr/libexec/vdsm/hooks/before_vm_migrate_destination/50_vmfex +usr/libexec/vdsm/hooks/before_vm_start/50_vmfex diff --git a/debian/vdsm.install b/debian/vdsm.install index 29fba0c..cc1790a 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -10,8 +10,6 @@ ./etc/pki/vdsm/keys/libvirt_password ./etc/rwtab.d/vdsm ./etc/sudoers.d/50_vdsm -./etc/sudoers.d/50_vdsm_hook_openstacknet -./etc/sudoers.d/50_vdsm_hook_vhostmd ./etc/sysctl.d/vdsm ./etc/vdsm-reg/logger.conf ./etc/vdsm-reg/vdsm-reg.conf @@ -57,22 +55,6 @@ ./usr/lib/python2.7/dist-packages/yajsonrpc/client.py ./usr/lib/python2.7/dist-packages/yajsonrpc/protonReactor.py ./usr/libexec/vdsm/curl-img-wrap -./usr/libexec/vdsm/hooks/after_device_create/50_openstacknet -./usr/libexec/vdsm/hooks/after_device_create/openstacknet_consts.py -./usr/libexec/vdsm/hooks/after_device_migrate_destination/50_openstacknet -./usr/libexec/vdsm/hooks/after_device_migrate_destination/openstacknet_consts.py -./usr/libexec/vdsm/hooks/after_nic_hotplug/50_openstacknet -./usr/libexec/vdsm/hooks/after_nic_hotplug/openstacknet_consts.py -./usr/libexec/vdsm/hooks/after_vm_destroy/50_vhostmd -./usr/libexec/vdsm/hooks/before_device_create/50_openstacknet -./usr/libexec/vdsm/hooks/before_device_create/openstacknet_consts.py -./usr/libexec/vdsm/hooks/before_nic_hotplug/50_openstacknet -./usr/libexec/vdsm/hooks/before_nic_hotplug/openstacknet_consts.py -./usr/libexec/vdsm/hooks/before_vm_dehibernate/50_vhostmd -./usr/libexec/vdsm/hooks/before_vm_migrate_destination/50_vhostmd -./usr/libexec/vdsm/hooks/before_vm_start/10_faqemu -./usr/libexec/vdsm/hooks/before_vm_start/50_qemucmdline -./usr/libexec/vdsm/hooks/before_vm_start/50_vhostmd ./usr/libexec/vdsm/libvirt_configure.sh ./usr/libexec/vdsm/ovirt_functions.sh ./usr/libexec/vdsm/persist-vdsm-hooks -- To view, visit http://gerrit.ovirt.org/18720 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1a34cbb08e0497c60d721f0a0c965aae5493033 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>

2 2

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches September 2013