Change in vdsm[ovirt-3.4]: Remove rsyslog requirement and leave the check of syslog fd ...

ybronhei at redhat.com ybronhei at redhat.com
Sat Sep 20 12:33:16 UTC 2014


Hello Dan Kenigsberg,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/33089

to review the following change.

Change subject: Remove rsyslog requirement and leave the check of syslog fd availability
......................................................................

Remove rsyslog requirement and leave the check of syslog fd availability

Some use syslog-ng instead of rsyslog daemon, this provides the same fd
to communicate with syslog. Instead of hard requirement in spec file, we
leave the check during pre-start and update the output.

Change-Id: I997c6b92b5567b4593fdaf3c7dd33739f59ffb85
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1143923
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/26941
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M debian/control
M debian/dependencyMap.txt
M init/vdsmd_init_common.sh.in
M vdsm.spec.in
4 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/33089/1

diff --git a/debian/control b/debian/control
index 45c2b1c..24092f6 100644
--- a/debian/control
+++ b/debian/control
@@ -109,7 +109,6 @@
  python-sepolgen,
  qemu-kvm (>= 1.4.0),
  qemu-utils (>= 1.4.0),
- rsyslog,
  sanlock (>= 2.4),
  sanlock-python (>= 2.4),
  sasl2-bin,
diff --git a/debian/dependencyMap.txt b/debian/dependencyMap.txt
index 91ef0a3..640eb4b 100644
--- a/debian/dependencyMap.txt
+++ b/debian/dependencyMap.txt
@@ -62,7 +62,6 @@
 qemu-img >= 2:0.15.0-4	qemu-utils
 qemu-kvm >= 2:0.15.0-4	qemu-kvm
 rpm-python	python-rpm
-rsyslog	rsyslog
 sanlock >= 2.4-2	TooOld:sanlock libsanlock-dev libsanlock-client1
 sanlock-python	self packaged:sanlock-python
 sed >= 4.2.1-10	sed
diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in
index c0d73cc..fed2f11 100644
--- a/init/vdsmd_init_common.sh.in
+++ b/init/vdsmd_init_common.sh.in
@@ -76,8 +76,10 @@
 
 task_syslog_available() {
     if ! [ -S "/dev/log" ]; then
-        echo "Cannot communicate with syslog deamon for reports. " \
-             "Check rsyslog.conf"
+        echo "    Cannot communicate with syslog daemon for reports. "
+        echo "    Install syslog daemon provider, configure it properly"
+        echo "    and start the service."
+        echo "    (Alternatives: rsyslog, syslog-ng)"
         return 1
     fi
     return 0
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 8c5d31a..8692461 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -102,7 +102,6 @@
 Requires: which
 Requires: sudo >= 1.7.3
 Requires: logrotate
-Requires: rsyslog
 Requires: xz
 Requires: ntp
 Requires: iproute


-- 
To view, visit http://gerrit.ovirt.org/33089
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I997c6b92b5567b4593fdaf3c7dd33739f59ffb85
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.4
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list