Change in vdsm[master]: net: Add retcode logging to cmd.exec_*
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: net: Add retcode logging to cmd.exec_*
......................................................................
net: Add retcode logging to cmd.exec_*
Change-Id: Ib4d6fe9768c6f62168d2858ad11b5dff22174594
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/cmd.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/77485
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4d6fe9768c6f62168d2858ad11b5dff22174594
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 10 months
Change in vdsm[master]: net test: Use cmd.exec_* in network tests
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net test: Use cmd.exec_* in network tests
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/77443
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic2efe3145f5d40474afd3eac95023636f5ed35ad
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 10 months
Change in vdsm[master]: net: Add retcode logging to cmd.exec_*
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Add retcode logging to cmd.exec_*
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/77485
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib4d6fe9768c6f62168d2858ad11b5dff22174594
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 11 months
Change in vdsm[master]: using io.open in passwd.py
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: using io.open in passwd.py
......................................................................
using io.open in passwd.py
Change-Id: I85696c7d0b2adf25b9bdb00f77fefdebeb773be9
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/tool/configurators/passwd.py
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/77433/1
diff --git a/lib/vdsm/tool/configurators/passwd.py b/lib/vdsm/tool/configurators/passwd.py
index 0969b4e..c36fbf8 100644
--- a/lib/vdsm/tool/configurators/passwd.py
+++ b/lib/vdsm/tool/configurators/passwd.py
@@ -18,11 +18,13 @@
#
from __future__ import absolute_import
+
+import io
+
from vdsm import constants
from vdsm import commands
from vdsm.common import cache
from vdsm.common import cmdutils
-
from . import YES, NO, MAYBE
@@ -47,7 +49,7 @@
def libvirt_sasl_isconfigured():
- with open(_SASL2_CONF, 'r') as f:
+ with io.open(_SASL2_CONF, 'r') as f:
lines = f.readlines()
# check for new default configuration - since libvirt 3.2
if 'mech_list: gssapi\n' in lines:
@@ -84,7 +86,7 @@
def configure_libvirt_sasl():
- with open(_SASL2_CONF, 'w') as f:
+ with io.open(_SASL2_CONF, 'w') as f:
f.writelines(['## start vdsm-4.20.0 configuration\n',
'mech_list: scram-sha-1\n',
'sasldb_path: %s\n' % (_LIBVIRT_SASLDB),
@@ -101,5 +103,5 @@
@cache.memoized
def libvirt_password():
- with open(LIBVIRT_PASSWORD_PATH) as passwd_file:
+ with io.open(LIBVIRT_PASSWORD_PATH) as passwd_file:
return passwd_file.readline().rstrip("\n")
--
To view, visit https://gerrit.ovirt.org/77433
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85696c7d0b2adf25b9bdb00f77fefdebeb773be9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 11 months
Change in vdsm[master]: constants: Move EXT_SYSTEMD_RUN from constants to cmdutils
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: constants: Move EXT_SYSTEMD_RUN from constants to cmdutils
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/77508
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0def7a0d36e25184220cadbc78c575107d8c31c5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 11 months
Change in vdsm[master]: net test: Use cmd.exec_* in network tests
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net test: Use cmd.exec_* in network tests
......................................................................
Patch Set 3: Code-Review+1
Petr, the doc you cited says that you must call wait or poll in order to update returncode.
poll returns None immediately if the underlying process has not finished yet.
--
To view, visit https://gerrit.ovirt.org/77443
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ic2efe3145f5d40474afd3eac95023636f5ed35ad
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 11 months
Change in vdsm[master]: Configure sasl2 libvirt to use scram-sha-1
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Configure sasl2 libvirt to use scram-sha-1
......................................................................
Configure sasl2 libvirt to use scram-sha-1
The default of mech_list was changed in libvirt 3.2 to gssapi. This
patch adds to isconfigured a check if the new value exists. If so,
configure will replace the content to mech_list: scram-sha-1
Change-Id: I589e7de6df46ebb2f971701cf99a313b3c4a2f8e
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1444426
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M lib/vdsm/tool/configurators/passwd.py
M vdsm.spec.in
2 files changed, 19 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/76934/1
diff --git a/lib/vdsm/tool/configurators/passwd.py b/lib/vdsm/tool/configurators/passwd.py
index 4c11ff3..7275323 100644
--- a/lib/vdsm/tool/configurators/passwd.py
+++ b/lib/vdsm/tool/configurators/passwd.py
@@ -24,13 +24,14 @@
from vdsm.common import cache
-from . import YES, NO
+from . import YES, NO, MAYBE
_SASLDBLISTUSERS2 = utils.CommandPath("sasldblistusers2",
"/usr/sbin/sasldblistusers2",
)
_LIBVIRT_SASLDB = "/etc/libvirt/passwd.db"
+_SASL2_CONF = "/etc/sasl2/libvirt.conf"
_SASLPASSWD2 = utils.CommandPath("saslpasswd2",
"/usr/sbin/saslpasswd2",
)
@@ -41,13 +42,21 @@
def isconfigured():
script = (str(_SASLDBLISTUSERS2), '-f', _LIBVIRT_SASLDB)
_, out, _ = commands.execCmd(script)
+ ret = MAYBE
for user in out:
if SASL_USERNAME in user:
- return YES
- return NO
+ ret = YES
+ with open(_SASL2_CONF, 'r') as f:
+ lines = f.readlines()
+ # check for new default configuration - since libvirt 3.2
+ if 'mech_list: gssapi' not in lines:
+ ret = NO
+ return ret
def configure():
+ configure_sasl2()
+
script = (str(_SASLPASSWD2), '-p', '-a', 'libvirt', SASL_USERNAME)
rc, _, err = commands.execCmd(script, data=libvirt_password())
if rc != 0:
@@ -68,6 +77,12 @@
raise RuntimeError("Remove password failed: %s" % (err,))
+def configure_sasl2():
+ with open(_SASL2_CONF, 'w') as f:
+ f.writelines(['mech_list: scram-sha-1\n',
+ 'sasldb_path: %s' % (_LIBVIRT_SASLDB)])
+
+
@cache.memoized
def libvirt_password():
with open(LIBVIRT_PASSWORD_PATH) as passwd_file:
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 3852aca..4b80ccb 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -169,6 +169,7 @@
Requires: fence-agents-all
Requires: systemd >= 219-11
Requires: initscripts >= 9.49.31
+Requires: cyrus-sasl-scram
%if 0%{?rhel}
Requires: e2fsprogs
--
To view, visit https://gerrit.ovirt.org/76934
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I589e7de6df46ebb2f971701cf99a313b3c4a2f8e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 11 months
Change in vdsm[master]: net: Route removal should not ignore the table it is in
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged.
Change subject: net: Route removal should not ignore the table it is in
......................................................................
net: Route removal should not ignore the table it is in
When querying the list of ip routes in a specific table,
the returned list in iproute2 implementation does not include the
table ID and therefore it was wrongly assumed as 'none'/any.
The table is returned in the report only if the table is 'all', which
reports all routes from all tables.
The ip.route/iproute2 driver has been updated to include the correct
table for each route data object.
Change-Id: I628d5db06e567a13056dbf83ad7b4d17d79b4ac6
Bug-Url: https://bugzilla.redhat.com/1452185
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/ip/route/iproute2.py
M tests/network/ip_route_test.py
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Looks good to me, but someone else must approve
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/77321
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I628d5db06e567a13056dbf83ad7b4d17d79b4ac6
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 11 months
Change in vdsm[master]: net: Route removal should not ignore the table it is in
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Route removal should not ignore the table it is in
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/77321
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I628d5db06e567a13056dbf83ad7b4d17d79b4ac6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 11 months
Change in vdsm[ovirt-4.1]: dmidecode: collect only system info
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: dmidecode: collect only system info
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/77432
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I97488bf273d69eb987360da152d712dde6d2167a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.1
Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 11 months