Change in vdsm[master]: Require abrt-cli for vdsm sos plugin
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: Require abrt-cli for vdsm sos plugin
......................................................................
Require abrt-cli for vdsm sos plugin
vdsm sos plugin uses abrt-cli output. without requiring that, sos output
will print an error. reasonable to require that as part of vdsm.
Change-Id: Id7a6cd0077b460b1b11a33e0ea23056f096f0143
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=917062
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/86/78386/1
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 31123a3..7c76d3a 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -110,6 +110,7 @@
Requires: rpm-python
Requires: nfs-utils
Requires: libnl3
+Requires: abrt-cli
Requires: abrt-addon-vmcore
Requires: abrt-addon-ccpp
Requires: abrt-addon-python
--
To view, visit https://gerrit.ovirt.org/78386
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7a6cd0077b460b1b11a33e0ea23056f096f0143
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 10 months
Change in vdsm[master]: place vdsm-logrotate under static
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: place vdsm-logrotate under static
......................................................................
place vdsm-logrotate under static
Change-Id: I210604f9cc2d3bb45b9d10bf9c11cae4344c52f5
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M static/Makefile.am
R static/etc/cron.hourly/vdsm-logrotate
M vdsm/Makefile.am
3 files changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/78549/1
diff --git a/static/Makefile.am b/static/Makefile.am
index 73c9348..1ad329e 100644
--- a/static/Makefile.am
+++ b/static/Makefile.am
@@ -111,6 +111,11 @@
libvirtpassworddir = $(vdsmtsdir)/keys
libvirtpassword_DATA = ./$(libvirtpassworddir)/libvirt_password
+cronhourlydir = $(sysconfdir)/cron.hourly
+dist_cronhourly_SCRIPTS = \
+ ./etc/cron.hourly/vdsm-logrotate \
+ $(NULL)
+
networkmanagerdir = $(sysconfdir)/NetworkManager/conf.d
networkmanager_DATA = \
diff --git a/vdsm/vdsm-logrotate b/static/etc/cron.hourly/vdsm-logrotate
similarity index 100%
rename from vdsm/vdsm-logrotate
rename to static/etc/cron.hourly/vdsm-logrotate
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index dbcde97..6d42a5c 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -56,7 +56,6 @@
vdsm-gencerts.sh.in \
vdsm-libvirt-access.pkla \
vdsm-libvirt-access.rules \
- vdsm-logrotate \
$(NULL)
all-local: \
@@ -68,7 +67,6 @@
chmod 775 $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
install-data-local: \
- install-data-logrotate \
install-data-vdsmconf
$(MKDIR_P) $(DESTDIR)$(vdsmrepo)
$(MKDIR_P) $(DESTDIR)$(vdsmrepo)/hsm-tasks
@@ -90,17 +88,7 @@
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
uninstall-local: \
- uninstall-data-logrotate \
uninstall-data-vdsmconf
-
-install-data-logrotate:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/cron.hourly
- $(INSTALL_SCRIPT) $(srcdir)/vdsm-logrotate \
- $(DESTDIR)$(sysconfdir)/cron.hourly/vdsm-logrotate
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/cron.d
-
-uninstall-data-logrotate:
- $(RM) $(DESTDIR)$(sysconfdir)/cron.hourly/vdsm-logrotate
install-data-vdsmconf:
$(MKDIR_P) $(DESTDIR)$(vdsmconfdir)/vdsm.conf.d
--
To view, visit https://gerrit.ovirt.org/78549
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I210604f9cc2d3bb45b9d10bf9c11cae4344c52f5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 10 months
Change in vdsm[master]: net: Unified configuration existance can have only nets or b...
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: net: Unified configuration existance can have only nets or bonds
......................................................................
Patch Set 1: Code-Review+2
Ouch
--
To view, visit https://gerrit.ovirt.org/78663
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia3b0c9e00241c9b4e3a11e56a0a93cc6d1246996
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: Michael Burman <mburman(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, 10 months
Change in vdsm[master]: replacing cpopen with subprocess32 for py2
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: replacing cpopen with subprocess32 for py2
......................................................................
replacing cpopen with subprocess32 for py2
Change-Id: Ie7edad0e87d63889788aa5fe6e8bb99a22dc66e5
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
M docker/Dockerfile.centos
M docker/Dockerfile.fedora.24
M docker/Dockerfile.fedora.25
M lib/vdsm/common/compat.py
M vdsm.spec.in
5 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/59/78659/1
diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
index cce155b..d99ee9b 100644
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@@ -22,7 +22,6 @@
ovirt-imageio-common \
psmisc \
python-blivet \
- python-cpopen \
python-dateutil \
python-decorator \
python-devel \
@@ -34,6 +33,7 @@
python-requests \
python-setuptools \
python-six \
+ python-subprocess32 \
python34 \
python34-nose \
python34-six \
diff --git a/docker/Dockerfile.fedora.24 b/docker/Dockerfile.fedora.24
index a6d43f3..4938ae1 100644
--- a/docker/Dockerfile.fedora.24
+++ b/docker/Dockerfile.fedora.24
@@ -24,7 +24,6 @@
ovirt-imageio-common \
psmisc \
python-blivet \
- python-cpopen \
python-dateutil \
python-decorator \
python-devel \
@@ -36,6 +35,7 @@
python-pthreading \
python-requests \
python-six \
+ python-subprocess32 \
python2-mock \
python3 \
python3-dateutil \
diff --git a/docker/Dockerfile.fedora.25 b/docker/Dockerfile.fedora.25
index 1ec0267..9faef9c 100644
--- a/docker/Dockerfile.fedora.25
+++ b/docker/Dockerfile.fedora.25
@@ -25,7 +25,6 @@
ovirt-imageio-common \
psmisc \
python-blivet1 \
- python-cpopen \
python-decorator \
python-devel \
python-inotify \
@@ -36,6 +35,7 @@
python-pthreading \
python-requests \
python-six \
+ python-subprocess32 \
python2-dateutil \
python2-mock \
python3 \
diff --git a/lib/vdsm/common/compat.py b/lib/vdsm/common/compat.py
index 6904571..edb5cd5 100644
--- a/lib/vdsm/common/compat.py
+++ b/lib/vdsm/common/compat.py
@@ -78,7 +78,7 @@
import json # NOQA: F401 (unused import)
if six.PY2:
- from cpopen import CPopen
+ from subprocess32 import Popen as CPopen
else:
from subprocess import Popen as CPopen # NOQA: F401 (unused import)
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 168bf2b..586b670 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -60,8 +60,8 @@
BuildRequires: openssl
BuildRequires: python
-BuildRequires: python-cpopen
BuildRequires: python-six >= 1.9.0
+BuildRequires: python-subprocess32
BuildRequires: python-dateutil
BuildRequires: python2-devel
BuildRequires: PyYAML
@@ -102,7 +102,7 @@
Requires: python-dateutil
Requires: python-netaddr
Requires: python-inotify
-Requires: python-cpopen >= 1.5
+Requires: python-subprocess32
Requires: python-ioprocess >= 0.16.1-1
Requires: python-pthreading >= 0.1.3-3
Requires: python-six >= 1.9.0
@@ -291,7 +291,6 @@
Summary: VDSM python libraries
Requires: %{name}-api = %{version}-%{release}
BuildArch: noarch
-Requires: python-cpopen >= 1.5
Requires: python-ioprocess >= 0.16.1-1
%description python
--
To view, visit https://gerrit.ovirt.org/78659
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7edad0e87d63889788aa5fe6e8bb99a22dc66e5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 10 months
Change in vdsm[master]: spec: make sure infra package is deleted on upgrade
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: spec: make sure infra package is deleted on upgrade
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/78357
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I8c975bffe713b716dfa9a8bc1bbee6d9a24fb144
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Irit Goihman <igoihman(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: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 10 months
Change in vdsm[master]: 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 29: -Code-Review
(1 comment)
https://gerrit.ovirt.org/#/c/78006/29/tests/network/static/bonding-name2n...
File tests/network/static/bonding-name2numeric.json:
Line 186: "layer2+3": "2",
Line 187: "layer3+4": "1"
Line 188: }
Line 189: }
Line 190: }
> What is this change?
trailing newline added by an evil editor.
(not that I care. both are valid json)
--
To view, visit https://gerrit.ovirt.org/78006
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698
Gerrit-PatchSet: 29
Gerrit-Project: vdsm
Gerrit-Branch: master
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: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: Yes
6 years, 10 months
Change in vdsm[master]: 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 29: Code-Review+1
--
To view, visit https://gerrit.ovirt.org/78006
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I98f7c691a2a86d152ebcb81e1d96f9b0d83fa698
Gerrit-PatchSet: 29
Gerrit-Project: vdsm
Gerrit-Branch: master
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: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 10 months
Change in vdsm[master]: tests: Remove global panic mocking
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has posted comments on this change.
Change subject: tests: Remove global panic mocking
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.ovirt.org/78592
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I8ceebdc2ae2d457e9be1b8121327f50a7fa4bfd0
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Irit Goihman <igoihman(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: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-HasComments: No
6 years, 10 months
Change in vdsm[master]: place dhclientmon.sh under static
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: place dhclientmon.sh under static
......................................................................
place dhclientmon.sh under static
This patch simplifies Makefile.am and clears a single file from the
vdsm/ directory.
Change-Id: I553285ba08e15e00db5a528a37bd8f8dfda8a33d
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M static/Makefile.am
R static/etc/dhcp/dhclient.d/dhclientmon.sh
M vdsm/Makefile.am
3 files changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/78547/1
diff --git a/static/Makefile.am b/static/Makefile.am
index 2640c0d..a6851e3 100644
--- a/static/Makefile.am
+++ b/static/Makefile.am
@@ -114,6 +114,11 @@
./etc/NetworkManager/conf.d/vdsm.conf \
$(NULL)
+dhclientmondir = $(sysconfdir)/dhcp/dhclient.d
+dist_dhclientmon_SCRIPTS = \
+ ./etc/dhcp/dhclient.d/dhclientmon.sh \
+ $(NULL)
+
systemdunitdir = $(SYSTEMD_UNIT_DIR)
systemdunit_DATA = \
diff --git a/vdsm/dhclientmon.sh b/static/etc/dhcp/dhclient.d/dhclientmon.sh
similarity index 100%
rename from vdsm/dhclientmon.sh
rename to static/etc/dhcp/dhclient.d/dhclientmon.sh
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 3df78ed..13b7f68 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -52,7 +52,6 @@
$(nodist_man8_MANS)
EXTRA_DIST = \
- dhclientmon.sh \
libvirt_password \
mk_sysprep_floppy.in \
vdsm-gencerts.sh.in \
@@ -70,7 +69,6 @@
chmod 775 $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
install-data-local: \
- install-data-dhclient-hooks \
install-data-libvirtpass \
install-data-logrotate \
install-data-vdsmconf
@@ -94,7 +92,6 @@
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/libvirt/qemu/channels
uninstall-local: \
- uninstall-data-dhclient-hooks \
uninstall-data-libvirtpass \
uninstall-data-logrotate \
uninstall-data-vdsmconf
@@ -121,12 +118,3 @@
uninstall-data-vdsmconf:
$(RM) $(DESTDIR)$(vdsmconfdir)/vdsm.conf.d
-
-install-data-dhclient-hooks:
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/dhcp/dhclient.d
- $(INSTALL_DATA) dhclientmon.sh \
- $(DESTDIR)$(sysconfdir)/dhcp/dhclient.d/dhclientmon.sh
- chmod 755 $(DESTDIR)$(sysconfdir)/dhcp/dhclient.d/dhclientmon.sh
-
-uninstall-data-dhclient-hooks:
- $(RM) $(DESTDIR)$(sysconfdir)/dhcp/dhclient.d/dhclientmon.sh
--
To view, visit https://gerrit.ovirt.org/78547
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I553285ba08e15e00db5a528a37bd8f8dfda8a33d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 10 months
Change in vdsm[master]: stomp: stop using hard coded values for heartbeats
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: stomp: stop using hard coded values for heartbeats
......................................................................
Patch Set 3:
(1 comment)
https://gerrit.ovirt.org/#/c/78293/3/lib/vdsm/jsonrpcvdscli.py
File lib/vdsm/jsonrpcvdscli.py:
Line 214: self._client.close()
Line 215:
Line 216:
Line 217: def _create(requestQueue, host=None, port=None, useSSL=None,
Line 218: responseQueue=None, incoming_heartbeat=5000, outgoing_heartbeat=0):
do we want the default to be configurable?.. maybe mention the default in the commit msg
Line 219: if host is None:
Line 220: host = 'localhost'
Line 221: if port is None:
Line 222: port = int(config.getint('addresses', 'management_port'))
--
To view, visit https://gerrit.ovirt.org/78293
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I19cfec389e9d24d70e64617471df0d1dceb4229f
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(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: Yes
6 years, 10 months