Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: vdsm-upgrade: use python scripts from ovirtnode
......................................................................
vdsm-upgrade: use python scripts from ovirtnode
Replace /usr/libexec/ovirt-config-boot call from deployUtil._logExec
to the newer python scripts from ovirtnode.
Change-Id: Id8b5770bdd4f09c3374176dbf2bb2b9afebd65e3
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com>
---
M vdsm_reg/vdsm-upgrade
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/7074/1
--
To view, visit http://gerrit.ovirt.org/7074
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8b5770bdd4f09c3374176dbf2bb2b9afebd65e3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com>
Federico Simoncelli has uploaded a new change for review.
Change subject: Use quiesce only if qgaEnable is enabled
......................................................................
Use quiesce only if qgaEnable is enabled
Do not attempt to use the quiesce live snapshot flag if the guest agent
channel is not present.
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
Change-Id: I8a44758949d7a328117f4d759d8d9df1183eb058
---
M vdsm/libvirtvm.py
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/7143/1
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 8bf5bb2..d8aecc1 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1791,8 +1791,10 @@
self._volumesPrepared = False
snapFlags = (libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY |
- libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT |
- libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE)
+ libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT)
+
+ if utils.tobool(self.conf.get('qgaEnable', 'true')):
+ snapFlags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE
while True:
try:
--
To view, visit http://gerrit.ovirt.org/7143
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a44758949d7a328117f4d759d8d9df1183eb058
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
Igor Lvovsky has uploaded a new change for review.
Change subject: Restore previous MTU on bond when VLAN with bigger MTU removed
......................................................................
Restore previous MTU on bond when VLAN with bigger MTU removed
Change-Id: Ifefa5dec03be7795e528821a4d17991eb0f60aea
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com>
---
M vdsm/configNetwork.py
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/7323/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 199adfa..14b9cfb 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -609,6 +609,8 @@
if newmtu != currmtu:
if bonding:
+ cf = self.NET_CONF_PREF + bonding
+ self._updateConfigValue(cf, 'MTU', newmtu, newmtu is None)
slaves = netinfo.slaves(bonding)
for slave in slaves:
cf = self.NET_CONF_PREF + slave
--
To view, visit http://gerrit.ovirt.org/7323
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifefa5dec03be7795e528821a4d17991eb0f60aea
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com>
Dan Kenigsberg has uploaded a new change for review.
Change subject: netConfig: translate to "new" option names from cmdline, too
......................................................................
netConfig: translate to "new" option names from cmdline, too
At some point in prehistoric past a former Vdsm developer decided to change the names of
various networking options. IPADDR had become ipaddr; BONDING_OPTS had
become bondingOptions; etc. We continued to support older-style names -
which are used up to this very day by ovirt-engine. Translation is done
by API.Global._translateOptionsToNew for each network API call.
However, we forgot to perform this translation when the network
configuration functions are called via the /usr/share/vdsm/addNetwork
script during bootstrap/registration.
This lacuna leads to IPADDR being written to configuration file
uncontrolably. This patch fixes the issue in the simplest quickest form
I could think of.
Change-Id: I2c18acb87ae0372d5af949f6fa4ab24d025d7faf
Bug-Id: BZ#847733 failure to create rhevm network over pre-configured VLAN
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/API.py
M vdsm/configNetwork.py
2 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/7390/1
diff --git a/vdsm/API.py b/vdsm/API.py
index ae04e01..2819727 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1166,7 +1166,7 @@
vlan(number) and bond are optional - pass the empty string to discard
them. """
- self._translateOptionsToNew(options)
+ self.translateNetOptionsToNew(options)
if not self._cif._networkSemaphore.acquire(blocking=False):
self.log.warn('concurrent network verb already executing')
return errCode['unavail']
@@ -1190,7 +1190,7 @@
def delNetwork(self, bridge, vlan=None, bond=None, nics=None, options={}):
"""Delete a network from this vds."""
- self._translateOptionsToNew(options)
+ self.translateNetOptionsToNew(options)
try:
if not self._cif._networkSemaphore.acquire(blocking=False):
@@ -1236,7 +1236,7 @@
nics=None, options={}):
"""Add a new network to this vds, replacing an old one."""
- self._translateOptionsToNew(options)
+ self.translateNetOptionsToNew(options)
if not self._cif._networkSemaphore.acquire(blocking=False):
self.log.warn('concurrent network verb already executing')
return errCode['unavail']
@@ -1364,7 +1364,8 @@
self.log.error(vmId + ': Lost connection to VM')
return count, active, migrating
- def _translateOptionsToNew(self, options):
+ @staticmethod
+ def translateNetOptionsToNew(options):
_translationMap = {
'IPADDR': 'ipaddr',
'NETMASK': 'netmask',
@@ -1376,6 +1377,6 @@
}
for k, v in options.items():
if k in _translationMap:
- self.log.warn("options %s is deprecated. Use %s instead" %
+ logging.warn("options %s is deprecated. Use %s instead" %
(k, _translationMap[k]))
options[_translationMap[k]] = options.pop(k)
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index d55a2cc..30427ce 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -1275,7 +1275,12 @@
def _parseKwargs(args):
- return dict(arg.split('=', 1) for arg in args)
+ import API
+
+ kwargs = dict(arg.split('=', 1) for arg in args)
+ API.Global._translateOptionsToNew(kwargs)
+
+ return kwargs
def main():
if len(sys.argv) <= 1:
--
To view, visit http://gerrit.ovirt.org/7390
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c18acb87ae0372d5af949f6fa4ab24d025d7faf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>