diff --git a/corosync-conf-example.patch b/bnc#882449-corosync-conf-example.patch similarity index 55% rename from corosync-conf-example.patch rename to bnc#882449-corosync-conf-example.patch index fe710e0..daddef2 100644 --- a/corosync-conf-example.patch +++ b/bnc#882449-corosync-conf-example.patch @@ -1,7 +1,7 @@ -Index: corosync-2.3.2/conf/corosync.conf.example +Index: corosync-2.3.3/conf/corosync.conf.example =================================================================== ---- corosync-2.3.2.orig/conf/corosync.conf.example -+++ corosync-2.3.2/conf/corosync.conf.example +--- corosync-2.3.3.orig/conf/corosync.conf.example ++++ corosync-2.3.3/conf/corosync.conf.example @@ -9,6 +9,12 @@ totem { crypto_cipher: none crypto_hash: none @@ -15,6 +15,17 @@ Index: corosync-2.3.2/conf/corosync.conf.example # interface: define at least one interface to communicate # over. If you define more than one interface stanza, you must # also set rrp_mode. +@@ -58,8 +64,8 @@ logging { + to_stderr: no + # Log to a log file. When set to "no", the "logfile" option + # must not be set. +- to_logfile: yes +- logfile: /var/log/cluster/corosync.log ++ to_logfile: no ++ #logfile: /var/log/cluster/corosync.log + # Log to the system log daemon. When in doubt, set to yes. + to_syslog: yes + # Log debug messages (very verbose). When in doubt, leave off. @@ -77,5 +83,5 @@ logging { quorum { # Enable and configure quorum subsystem (default: off) @@ -22,10 +33,10 @@ Index: corosync-2.3.2/conf/corosync.conf.example - #provider: corosync_votequorum + provider: corosync_votequorum } -Index: corosync-2.3.2/conf/corosync.conf.example.udpu +Index: corosync-2.3.3/conf/corosync.conf.example.udpu =================================================================== ---- corosync-2.3.2.orig/conf/corosync.conf.example.udpu -+++ corosync-2.3.2/conf/corosync.conf.example.udpu +--- corosync-2.3.3.orig/conf/corosync.conf.example.udpu ++++ corosync-2.3.3/conf/corosync.conf.example.udpu @@ -5,6 +5,8 @@ totem { crypto_cipher: none crypto_hash: none @@ -35,6 +46,18 @@ Index: corosync-2.3.2/conf/corosync.conf.example.udpu interface { ringnumber: 0 bindnetaddr: 10.16.35.0 +@@ -16,9 +18,9 @@ totem { + + logging { + fileline: off +- to_logfile: yes ++ to_logfile: no ++ #logfile: /var/log/cluster/corosync.log + to_syslog: yes +- logfile: /var/log/cluster/corosync.log + debug: off + timestamp: on + logger_subsys { @@ -54,5 +56,5 @@ nodelist { quorum { # Enable and configure quorum subsystem (default: off) diff --git a/corosync.changes b/corosync.changes index 32a4760..aa133c4 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 13 03:13:13 UTC 2014 - lzhong@suse.com + +- Update corosync.conf.example and corosync.conf.example.udpu(bnc#882449) + - remove corosync-conf-example.patch + + add bnc#882449-corosync-conf-example.patch + +------------------------------------------------------------------- Fri Apr 11 06:50:17 UTC 2014 - lzhong@suse.com - Fix `systemctl stop pacemaker` leaves corosync running diff --git a/corosync.spec b/corosync.spec index ef72548..ab4edd4 100644 --- a/corosync.spec +++ b/corosync.spec @@ -51,9 +51,9 @@ Source0: %{name}-%{version}.tar.gz Source2: baselibs.conf Patch1: corosync-init-lockfile-path-error.patch Patch2: corosync-cts-api-error.patch -Patch3: corosync-conf-example.patch -Patch4: bnc#867767-add-version.patch -Patch5: bnc#872651-stop-cluster.patch +Patch3: bnc#867767-add-version.patch +Patch4: bnc#872651-stop-cluster.patch +Patch5: bnc#882449-corosync-conf-example.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not # provide openais on purpose, the package has been deleted.