Change in vdsm[master]: Fix string in diskunmap hook README file
by Dan Kenigsberg
Dan Kenigsberg has submitted this change and it was merged.
Change subject: Fix string in diskunmap hook README file
......................................................................
Fix string in diskunmap hook README file
diskunmap README file has a copy/paste mistake. This patch fixes it.
Change-Id: I33a872a4b05451f235167c99e4ec01da80d0f557
Signed-off-by: Javier Coscia <ciudavitacos(a)gmail.com>
Reviewed-on: https://gerrit.ovirt.org/45665
Continuous-Integration: Jenkins CI
Reviewed-by: Amador Pahim <apahim(a)redhat.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm_hooks/diskunmap/README
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Javier Coscia: Verified
Jenkins CI: Passed CI tests
Amador Pahim: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/45665
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33a872a4b05451f235167c99e4ec01da80d0f557
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Javier Coscia <ciudavitacos(a)gmail.com>
Gerrit-Reviewer: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Javier Coscia <ciudavitacos(a)gmail.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
8 years, 8 months
Change in vdsm[master]: Fix string in diskunmap hook README file
by Dan Kenigsberg
Dan Kenigsberg has posted comments on this change.
Change subject: Fix string in diskunmap hook README file
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/45665
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I33a872a4b05451f235167c99e4ec01da80d0f557
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Javier Coscia <ciudavitacos(a)gmail.com>
Gerrit-Reviewer: Amador Pahim <apahim(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Javier Coscia <ciudavitacos(a)gmail.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
8 years, 8 months
Change in vdsm[master]: network.api: EL7's dhclient doesn't support -df so stop usin...
by osvoboda＠redhat.com
Ondřej Svoboda has uploaded a new change for review.
Change subject: network.api: EL7's dhclient doesn't support -df so stop using it temporarily
......................................................................
network.api: EL7's dhclient doesn't support -df so stop using it temporarily
Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Bug-Url: https://bugzilla.redhat.com/1219429
Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com>
---
M vdsm/network/api.py
M vdsm/network/configurators/__init__.py
M vdsm/network/configurators/dhclient.py
3 files changed, 26 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/45713/1
diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index 5b3a905..5bd675a 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -36,7 +36,7 @@
from vdsm import utils
from vdsm import ipwrapper
-from .configurators import libvirt
+from .configurators import dhclient, libvirt
from .errors import ConfigNetworkError
from . import errors as ne
from .models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
@@ -608,6 +608,14 @@
If there is dhclient already running on a bridge's port we have to use the
same DHCP unique identifier (DUID) in order to get the same IP address.
"""
+ # On EL7 dhclient doesn't have a -df option (to read DUID from the port's
+ # lease file). We must detect if the option is available, by running
+ # dhclient manually. To unbreak a beta4 release we just won't use the -df
+ # option in that case. A proper fix is probably to fall back to -lf,
+ # passing to it a modified NIC lease file.
+ if not dhclient.supports_duid_file():
+ return
+
for devices in (_netinfo.nics, _netinfo.bondings, _netinfo.vlans):
port = devices.get(bridge.port.name)
if port and port['dhcpv4']:
diff --git a/vdsm/network/configurators/__init__.py b/vdsm/network/configurators/__init__.py
index bca3eba..86e17a1 100644
--- a/vdsm/network/configurators/__init__.py
+++ b/vdsm/network/configurators/__init__.py
@@ -176,7 +176,7 @@
def runDhclient(iface, family=4, default_route=False):
dhclient = DhcpClient(iface.name, family, default_route, iface.duid_source)
- rc = dhclient.start(iface.blockingdhcp)
+ rc, _, _ = dhclient.start(iface.blockingdhcp)
if iface.blockingdhcp and rc:
raise ConfigNetworkError(ERR_FAILED_IFUP, 'dhclient%s failed' % family)
diff --git a/vdsm/network/configurators/dhclient.py b/vdsm/network/configurators/dhclient.py
index 181c302..6133243 100644
--- a/vdsm/network/configurators/dhclient.py
+++ b/vdsm/network/configurators/dhclient.py
@@ -28,10 +28,7 @@
from vdsm import cmdutils
from vdsm import ipwrapper
from vdsm import netinfo
-from vdsm.utils import CommandPath
-from vdsm.utils import execCmd
-from vdsm.utils import pgrep
-from vdsm.utils import rmFile
+from vdsm.utils import CommandPath, execCmd, memoized, pgrep, rmFile
DHCLIENT_CGROUP = 'vdsm-dhclient'
LEASE_DIR = '/var/lib/dhclient'
@@ -73,8 +70,8 @@
def start(self, blocking):
if blocking:
- rc, _, _ = self._dhclient()
- return rc
+ rc, out, err = self._dhclient()
+ return rc, out, err
else:
t = threading.Thread(target=self._dhclient, name='vdsm-dhclient-%s'
% self.iface)
@@ -137,3 +134,16 @@
raise
if pid_file is not None:
rmFile(pid_file)
+
+
+(a)utils.memoized
+def supports_duid_file():
+ probe = DhcpClient('-invalid-option') # dhclient doesn't have -h/--help
+ rc, out, err = probe.start(blocking=True)
+ if rc:
+ for line in err:
+ if '-df' in line:
+ return True
+ return False
+ else:
+ raise AssertionError("dhclient shouldn't succeed with invalid options")
--
To view, visit https://gerrit.ovirt.org/45713
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia096d42d24b00e7ef075f1a2dde7e3a951c0b81c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>
8 years, 8 months
Change in vdsm[master]: vdscli: host verification fails on client side
by Piotr Kliczewski
Piotr Kliczewski has uploaded a new change for review.
Change subject: vdscli: host verification fails on client side
......................................................................
vdscli: host verification fails on client side
When we provide hostname or run functional tests and attempt to connect
to the server using jsonrpcvdscli we fail ssl handshake due to how
m2cytpro host verification is written. In order to establish a
connection we need to provide ip address instead.
Change-Id: Iae0b8e71f4e3e03432db6c8f9dcf0a69c4612fc2
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
---
M lib/vdsm/jsonrpcvdscli.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/45449/1
diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py
index e1efb3f..787f4b8 100644
--- a/lib/vdsm/jsonrpcvdscli.py
+++ b/lib/vdsm/jsonrpcvdscli.py
@@ -124,7 +124,8 @@
useSSL=None,
responseQueue=None):
if host is None:
- host = socket.gethostname()
+ _, _, addrlist = socket.gethostbyaddr(socket.gethostname())
+ host = addrlist[0]
if port is None:
port = int(config.getint('addresses', 'management_port'))
--
To view, visit https://gerrit.ovirt.org/45449
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae0b8e71f4e3e03432db6c8f9dcf0a69c4612fc2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
8 years, 8 months
Change in vdsm[master]: ssl: m2crypto removal
by automation＠ovirt.org
automation(a)ovirt.org has posted comments on this change.
Change subject: ssl: m2crypto removal
......................................................................
Patch Set 18:
* Update tracker::#1147148::OK
* Check Bug-Url::OK
* Check Public Bug::#1147148::OK, public bug
* Check Product::#1147148::OK, Correct product oVirt
* Check TR::SKIP, not in a monitored branch (ovirt-3.5 ovirt-3.4 ovirt-3.3 ovirt-3.2)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
--
To view, visit https://gerrit.ovirt.org/39990
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3f2688b6c00eadd3f15be0ced926a397b55c1f33
Gerrit-PatchSet: 18
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Dima Kuznetsov <dmitrykuzn(a)gmail.com>
Gerrit-Reviewer: Eldad Marciano <emarcian(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No
8 years, 8 months
Change in vdsm[master]: WIP: packaging: updating for VDSM 4.17 on Debian jessie
by stirabos＠redhat.com
Simone Tiraboschi has uploaded a new change for review.
Change subject: WIP: packaging: updating for VDSM 4.17 on Debian jessie
......................................................................
WIP: packaging: updating for VDSM 4.17 on Debian jessie
Updating debian packaging configuration to package
VDSM 4.17 for Debian jessie
Change-Id: I04be8619306e387f8fd528e2bf072c37e7ea8483
Signed-off-by: stirabos <stirabos(a)debian7t1.localdomain>
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/37737/1
diff --git a/debian/changelog b/debian/changelog
index 5f0d324..1febeb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdsm (4.17.0-1) unstable; urgency=low
+
+ * vdsm 4.17.0 release on Debian Jessie
+
+ -- Simone Tiraboschi <stirabos(a)redhat.com> Mon, 09 Feb 2015 12:00:00 +0200
+
vdsm (4.13.0-1) unstable; urgency=low
* vdsm 4.13.0 release on Ubuntu 13.04.
diff --git a/debian/control b/debian/control
index 63fc383..0c5f220 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: vdsm
Section: admin
Priority: extra
-Maintainer: Zheng Sheng, Zhou <zhshzhou(a)linux.vnet.ibm.com>
+Maintainer: Simone Tiraboschi <stirabos(a)redhat.com>
Build-Depends: debhelper (>= 8.0.0),
autoconf,
automake,
@@ -26,8 +26,9 @@
python-pthreading (>=0.1.2),
python-rpm,
python-selinux,
- sudo (>= 1.7.3)
- python-simplejson (>= 2.0.9)
+ sudo (>= 1.7.3),
+ python-simplejson (>= 2.0.9),
+ python-ioprocess (>= 0.14)
Standards-Version: 3.9.4
Homepage: http://www.ovirt.org/wiki/Vdsm
Vcs-Git: git://gerrit.ovirt.org/vdsm
@@ -96,6 +97,7 @@
psmisc (>= 22.6),
python (>= 2.7.3),
python-cpopen (>= 1.3),
+ python-ioprocess (>= 0.14),
python-dmidecode,
python-libvirt (>= 1.1.1),
python-m2crypto,
--
To view, visit http://gerrit.ovirt.org/37737
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04be8619306e387f8fd528e2bf072c37e7ea8483
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com>
8 years, 8 months
Change in vdsm[ovirt-3.5]: ssl: ssl protocol configurable
by Piotr Kliczewski
Hello Saggi Mizrahi, Dan Kenigsberg,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/43183
to review the following change.
Change subject: ssl: ssl protocol configurable
......................................................................
ssl: ssl protocol configurable
We make ssl protocol configurable in config.py.
Change-Id: Idb4889cb30f23c5e3e9221893cf07a02d051d8b5
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
Bug-Url: https://bugzilla.redhat.com/1154184
Reviewed-on: http://gerrit.ovirt.org/34345
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
Reviewed-by: Saggi Mizrahi <smizrahi(a)redhat.com>
---
M lib/vdsm/config.py.in
M lib/vdsm/sslutils.py
M vdsm/clientIF.py
3 files changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/43183/1
diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index 944aaa8..c9e5719 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -228,6 +228,9 @@
('transient_disks_repository', '@VDSMLIBDIR@/transient',
'Local path to the transient disks repository.'),
+
+ ('ssl_protocol', 'sslv23',
+ 'SSL protocol used by encrypted connection'),
]),
# Section: [ksm]
diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py
index 8cbaad0..0ba92d0 100644
--- a/lib/vdsm/sslutils.py
+++ b/lib/vdsm/sslutils.py
@@ -132,7 +132,7 @@
class SSLContext(object):
def __init__(self, cert_file, key_file, ca_cert=None, session_id="SSL",
- protocol="sslv23"):
+ protocol="tlsv1"):
self.cert_file = cert_file
self.key_file = key_file
self.ca_cert = ca_cert
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 3678f9d..f300ee0 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -170,7 +170,9 @@
key_file = os.path.join(truststore_path, 'keys', 'vdsmkey.pem')
cert_file = os.path.join(truststore_path, 'certs', 'vdsmcert.pem')
ca_cert = os.path.join(truststore_path, 'certs', 'cacert.pem')
- sslctx = SSLContext(cert_file, key_file, ca_cert)
+ protocol = config.get('vars', 'ssl_protocol')
+ sslctx = SSLContext(cert_file, key_file, ca_cert=ca_cert,
+ protocol=protocol)
return sslctx
def _prepareXMLRPCBinding(self, port):
--
To view, visit https://gerrit.ovirt.org/43183
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb4889cb30f23c5e3e9221893cf07a02d051d8b5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>
8 years, 8 months
Change in vdsm[ovirt-3.5]: readd back "jsonrpc: StoragePool_removeVM"
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: readd back "jsonrpc: StoragePool_removeVM"
......................................................................
readd back "jsonrpc: StoragePool_removeVM"
We need this after 3.5.4 is out
This reverts commit d951f7ac26d77209ec7fc172de90da3fbc7bd5ca.
Change-Id: I99892510753910288592146365f6a438898e7260
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M vdsm/API.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/45022/1
diff --git a/vdsm/API.py b/vdsm/API.py
index 36fafe2..0c2c46b 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1134,8 +1134,8 @@
def updateVMs(self, vmList, sdUUID):
return self._irs.updateVM(self._UUID, vmList, sdUUID)
- def removeVM(self, vmUUID, sdUUID):
- return self._irs.removeVM(self._UUID, vmUUID, sdUUID)
+ def removeVM(self, vmUUID, storagedomainID=None):
+ return self._irs.removeVM(self._UUID, vmUUID, storagedomainID)
class Global(APIBase):
--
To view, visit https://gerrit.ovirt.org/45022
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99892510753910288592146365f6a438898e7260
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
8 years, 8 months
Change in vdsm[ovirt-3.5]: readd back "jsonrpc: StoragePool_updateVMs"
by fromani＠redhat.com
Francesco Romani has uploaded a new change for review.
Change subject: readd back "jsonrpc: StoragePool_updateVMs"
......................................................................
readd back "jsonrpc: StoragePool_updateVMs"
We need this after 3.5.4 is out
This reverts commit c82ba2b85a429e6cf33a220a82ccd8dbd9cb377b.
Change-Id: I60c6e54b68a5ccac6c8708da9284f97a5568207c
Signed-off-by: Francesco Romani <fromani(a)redhat.com>
---
M vdsm/API.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/45023/1
diff --git a/vdsm/API.py b/vdsm/API.py
index 0c2c46b..6e4704f 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1131,8 +1131,8 @@
return self._irs.validateStorageServerConnection(
domainType, self._UUID, connectionParams)
- def updateVMs(self, vmList, sdUUID):
- return self._irs.updateVM(self._UUID, vmList, sdUUID)
+ def updateVMs(self, vmList, storagedomainID=None):
+ return self._irs.updateVM(self._UUID, vmList, storagedomainID)
def removeVM(self, vmUUID, storagedomainID=None):
return self._irs.removeVM(self._UUID, vmUUID, storagedomainID)
--
To view, visit https://gerrit.ovirt.org/45023
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60c6e54b68a5ccac6c8708da9284f97a5568207c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>
8 years, 8 months
Change in vdsm[ovirt-3.5]: logging: remove log messages which give little or no value
by Piotr Kliczewski
Piotr Kliczewski has uploaded a new change for review.
Change subject: logging: remove log messages which give little or no value
......................................................................
logging: remove log messages which give little or no value
Some of the messages logged during jsonrpc request processing give no or
little value when diagnosing the issues but are logged quite often.
This patch removes those messages.
Change-Id: If5c6648f39b24adb1a5950c80a3883de0182b3b4
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com>
Bug-Url: https://bugzilla.redhat.com/1239062
---
M lib/yajsonrpc/__init__.py
M lib/yajsonrpc/stompReactor.py
2 files changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/43262/1
diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py
index 5b476a2..53b4e2f 100644
--- a/lib/yajsonrpc/__init__.py
+++ b/lib/yajsonrpc/__init__.py
@@ -527,7 +527,6 @@
@traceback(on=log.name)
def serve_requests(self):
while True:
- self.log.debug("Waiting for request")
obj = self._workQueue.get()
if obj is None:
break
diff --git a/lib/yajsonrpc/stompReactor.py b/lib/yajsonrpc/stompReactor.py
index 78b274b..3f003c6 100644
--- a/lib/yajsonrpc/stompReactor.py
+++ b/lib/yajsonrpc/stompReactor.py
@@ -95,7 +95,6 @@
self._messageHandler(self, frame.body)
def handle_frame(self, dispatcher, frame):
- self.log.debug("Handling message %s", frame)
try:
self._commands[frame.command](dispatcher, frame)
except KeyError:
--
To view, visit https://gerrit.ovirt.org/43262
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5c6648f39b24adb1a5950c80a3883de0182b3b4
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
8 years, 8 months