From e3d978ecb214e19e58891071588e574045f3f27327f779f085596b63d7409603 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 29 Aug 2016 10:31:30 +0000 Subject: [PATCH] Accepting request 423643 from home:yan_gao:branches:network:ha-clustering:Factory:Test - cts: Restart systemd-journald with "systemctl restart systemd-journald.socket" (bsc#995365) * bug-995365_pacemaker-cts-restart-systemd-journald.patch OBS-URL: https://build.opensuse.org/request/show/423643 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=253 --- ...pacemaker-cts-restart-systemd-journald.patch | 17 +++++++++++++++++ pacemaker.changes | 6 ++++++ pacemaker.spec | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 bug-995365_pacemaker-cts-restart-systemd-journald.patch diff --git a/bug-995365_pacemaker-cts-restart-systemd-journald.patch b/bug-995365_pacemaker-cts-restart-systemd-journald.patch new file mode 100644 index 0000000..3f824ee --- /dev/null +++ b/bug-995365_pacemaker-cts-restart-systemd-journald.patch @@ -0,0 +1,17 @@ +Index: pacemaker/cts/CTSaudits.py +=================================================================== +--- pacemaker.orig/cts/CTSaudits.py ++++ pacemaker/cts/CTSaudits.py +@@ -67,10 +67,8 @@ class LogAudit(ClusterAudit): + + for node in nodes: + if self.CM.Env["have_systemd"]: +- if self.CM.rsh(node, "systemctl stop systemd-journald.socket") != 0: +- self.CM.log ("ERROR: Cannot stop 'systemd-journald' on %s" % node) +- if self.CM.rsh(node, "systemctl start systemd-journald.service") != 0: +- self.CM.log ("ERROR: Cannot start 'systemd-journald' on %s" % node) ++ if self.CM.rsh(node, "systemctl restart systemd-journald.socket") != 0: ++ self.CM.log ("ERROR: Cannot restart 'systemd-journald' on %s" % node) + + if self.CM.rsh(node, "service %s restart" % self.CM.Env["syslogd"]) != 0: + self.CM.log ("ERROR: Cannot restart '%s' on %s" % (self.CM.Env["syslogd"], node)) diff --git a/pacemaker.changes b/pacemaker.changes index bf764db..5fbf184 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 26 16:20:25 UTC 2016 - ygao@suse.com + +- cts: Restart systemd-journald with "systemctl restart systemd-journald.socket" (bsc#995365) + * bug-995365_pacemaker-cts-restart-systemd-journald.patch + ------------------------------------------------------------------- Fri Jul 8 09:58:46 UTC 2016 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 7b72b48..b19fdd0 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -55,6 +55,7 @@ Patch6: bug-812269_pacemaker-fencing-device-register-messages.patch Patch7: pacemaker-Wno-format-signedness.patch Patch8: bug-943295_pacemaker-lrmd-log-notice.patch Patch9: bug-977201_pacemaker-controld-self-fencing.patch +Patch10: bug-995365_pacemaker-cts-restart-systemd-journald.patch # Required for core functionality (python-devel depends on python) BuildRequires: autoconf BuildRequires: automake @@ -262,6 +263,7 @@ manager for Corosync, CMAN and/or Linux-HA. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build autoreconf -fvi