Change in vdsm[ovirt-4.1]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Relocate DEFAULT_MTU costant to link.iface module
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/79161
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.1
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, 9 months
Change in vdsm[master]: packaging: eliminate /usr/lib/systemd/systemd-vdsmd
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: packaging: eliminate /usr/lib/systemd/systemd-vdsmd
......................................................................
packaging: eliminate /usr/lib/systemd/systemd-vdsmd
This script was introduced many years ago (commit c01a733c) as a helper
to the makeshift systemd service. Mistakenly, it was not removed by
commit ad15e459 that introduced a proper systemd service. This patch
drops the long-dead code.
Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M .gitignore
M init/systemd/Makefile.am
D init/systemd/systemd-vdsmd.in
M vdsm.spec.in
4 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/79153/1
diff --git a/.gitignore b/.gitignore
index 0f8849c..9937872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@
configure
cscope.out
doc/build
-init/systemd/systemd-vdsmd
init/systemd/vdsm-tmpfiles.d.conf
init/vdsmd_init_common.sh
lib/vdsm/api/vdsm-api.html
diff --git a/init/systemd/Makefile.am b/init/systemd/Makefile.am
index 2ff6be8..8f1e12b 100644
--- a/init/systemd/Makefile.am
+++ b/init/systemd/Makefile.am
@@ -21,7 +21,6 @@
include $(top_srcdir)/build-aux/Makefile.subs
nodist_noinst_DATA = \
- systemd-vdsmd \
vdsm-tmpfiles.d.conf \
$(NULL)
@@ -32,7 +31,6 @@
EXTRA_DIST = \
85-vdsmd.preset \
- systemd-vdsmd.in \
vdsm-tmpfiles.d.conf.in \
unlimited-core.conf \
$(NULL)
diff --git a/init/systemd/systemd-vdsmd.in b/init/systemd/systemd-vdsmd.in
deleted file mode 100644
index a502b62..0000000
--- a/init/systemd/systemd-vdsmd.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Copyright 2013 IBM, 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
-#
-
-usage_exit(){
- echo 'Usage: systemd-vdsmd reconfigure [force]' >&2
- exit 1
-}
-
-[ "$1" != "reconfigure" ] && usage_exit
-[ -n "$2" -a "$2" != "force" ] && usage_exit
-
-if [ "$2" = "force" ] || ! "@BINDIR@/vdsm-tool" is-configured; then
- "@BINDIR@/vdsm-tool" configure --force
-fi
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 4dc79f7..fb899fd 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -735,7 +735,6 @@
install -Dm 0644 lib/vdsm/storage/vdsm-lvm.rules \
%{buildroot}%{_udevrulesdir}/12-vdsm-lvm.rules
-install -Dm 0755 init/systemd/systemd-vdsmd %{buildroot}%{_libdir}/systemd/systemd-vdsmd
install -Dm 0644 init/systemd/85-vdsmd.preset %{buildroot}%{_presetdir}/85-vdsmd.preset
install -Dm 0644 init/systemd/vdsm-tmpfiles.d.conf \
@@ -858,7 +857,6 @@
%doc lib/vdsm/vdsm.conf.sample
%doc README.logging
%license COPYING
-%{_libdir}/systemd/systemd-vdsmd
%{_presetdir}/85-vdsmd.preset
%{_unitdir}/dev-hugepages1G.mount
%{_unitdir}/vdsmd.service
--
To view, visit https://gerrit.ovirt.org/79153
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04bd7e8acfbbfb5a0ec2cfc0239a243624083bf1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 9 months
Change in vdsm[master]: network: todo py3 nettestlib Tap
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: network: todo py3 nettestlib Tap
......................................................................
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/78863/3/tests/network/nettestlib.py
File tests/network/nettestlib.py:
Line 186:
Line 187: _deviceListener = None
Line 188:
Line 189: def addDevice(self):
Line 190: self._cloneDevice = open('/dev/net/tun', 'r+b', buffering=0)
use io.open to have better control on file encoding
Line 191: ifr = struct.pack('16sH', conv.to_binary(self.devName), self._IFF_TAP |
Line 192: self._IFF_NO_PI)
Line 193: fcntl.ioctl(self._cloneDevice, self._TUNSETIFF, ifr)
Line 194: self.up()
--
To view, visit https://gerrit.ovirt.org/78863
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9d899d6e8bfe332174b722362136cc79de982c28
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
6 years, 9 months
Change in vdsm[master]: spec: drop VDSMRPCPYLIBDIR
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: spec: drop VDSMRPCPYLIBDIR
......................................................................
spec: drop VDSMRPCPYLIBDIR
The spec file always replaces @VDSMRPCPYLIBDIR@ with the path of
vdsm.rpc package. This can be done much simpler in python code.
The original complexity was introduced, most probably, because of the
former separation between lib/vdsm/ and vdsm/ trees.
Change-Id: Ia44205ba4b844d666d6a328c19b137f9ef47bb40
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/api/vdsmapi.py
M lib/vdsm/constants.py.in
M vdsm.spec.in
3 files changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/78910/1
diff --git a/lib/vdsm/api/vdsmapi.py b/lib/vdsm/api/vdsmapi.py
index 148309e..985b122 100755
--- a/lib/vdsm/api/vdsmapi.py
+++ b/lib/vdsm/api/vdsmapi.py
@@ -72,7 +72,7 @@
from vdsm import constants
localpath = os.path.dirname(__file__)
- installedpath = constants.P_VDSM_RPC
+ installedpath = os.path.join(localpath, '..', 'rpc')
for directory in (localpath, installedpath):
path = os.path.join(directory, schema_name + '.yml')
# we use source tree and deployment directory
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 18d71b2..004fbd9 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -76,7 +76,6 @@
P_LIBVIRT_VMCHANNELS = '/var/lib/libvirt/qemu/channels/'
P_OVIRT_VMCONSOLES = '/var/run/ovirt-vmconsole-console/'
P_VDSM = '@VDSMDIR@/' # NOQA: E501 (potentially long line)
-P_VDSM_RPC = '@VDSMRPCPYLIBDIR@/'
P_VDSM_HOOKS = '@HOOKSDIR@/' # NOQA: E501 (potentially long line)
P_VDSM_LIB = '@VDSMLIBDIR@/' # NOQA: E501 (potentially long line)
P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line)
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 7084d91..3cc1ec3 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -723,8 +723,6 @@
-e 's/^raw_version_revision =.*/raw_version_revision = "'"${rawversion}"'"/' \
-e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' lib/vdsm/dsaversion.py
-sed -i -e 's\@VDSMRPCPYLIBDIR@\%{python_sitelib}/%{vdsm_name}/rpc\g' lib/vdsm/constants.py
-
%install
make DESTDIR=%{buildroot} install
--
To view, visit https://gerrit.ovirt.org/78910
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia44205ba4b844d666d6a328c19b137f9ef47bb40
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 9 months
Change in vdsm[ovirt-3.6]: net: Generate dump bonding options on boot and upgrade
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Generate dump bonding options on boot and upgrade
......................................................................
Patch Set 8: Code-Review-1
-1 for visibility
--
To view, visit https://gerrit.ovirt.org/78780
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Leon Goldberg <lgoldber(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: Leon Goldberg <lgoldber(a)redhat.com>
Gerrit-Reviewer: Meni Yakove <myakove(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 9 months
Change in vdsm[master]: net: On MTU change to the default value update the ifcfg file
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79110 )
Change subject: net: On MTU change to the default value update the ifcfg file
......................................................................
net: On MTU change to the default value update the ifcfg file
When changing only the MTU on a bridged network to the default value
(1500), the new value has not been updated in the ifcfg file.
The problem has been detected on RHEL 7.4, where the MTU of the bridge
is automatically updated to the default when it has no ports connected.
Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a
Bug-Url: https://bugzilla.redhat.com/1460687
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/legacy_switch.py
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Meni Yakove: Verified
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/79110
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a
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: Meni Yakove <myakove(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
6 years, 9 months
Change in vdsm[master]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79109 )
Change subject: net: Relocate DEFAULT_MTU costant to link.iface module
......................................................................
net: Relocate DEFAULT_MTU costant to link.iface module
Users of the DEFAULT_MTU do not directly need netinfo, they just require
the default mtu value.
This patch is partially cleanin up netinfo package and avoids uneeded
dependency on netinfo.
Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35
Bug-Url: https://bugzilla.redhat.com/1460687
Signed-off-by: Edward Haas <edwardh(a)redhat.com>
---
M lib/vdsm/network/canonicalize.py
M lib/vdsm/network/configurators/ifcfg.py
M lib/vdsm/network/link/iface.py
M lib/vdsm/network/netinfo/mtus.py
M tests/functional/networkTests.py
M tests/network/config_network_test.py
6 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Edward Haas: Verified
--
To view, visit https://gerrit.ovirt.org/79109
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35
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, 9 months
Change in vdsm[master]: net: On MTU change to the default value update the ifcfg file
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: On MTU change to the default value update the ifcfg file
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/79110
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib55712725c19e7d20fa8491c8ee78f6f9298ff9a
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: Meni Yakove <myakove(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 9 months
Change in vdsm[master]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Relocate DEFAULT_MTU costant to link.iface module
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/79109
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35
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, 9 months
Change in vdsm[master]: net: Relocate DEFAULT_MTU costant to link.iface module
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Relocate DEFAULT_MTU costant to link.iface module
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/79109
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7ec8d809ff6c93398f3d28a158b3dc31fbbda35
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, 9 months