Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2014-06-16 21:26:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ha-cluster-bootstrap (Old)
and /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ha-cluster-bootstrap"
Changes:
--------
---
/work/SRC/openSUSE:Factory/ha-cluster-bootstrap/ha-cluster-bootstrap.changes
2014-04-11 13:30:01.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2014-06-16 21:26:40.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Jun 13 02:49:22 UTC 2014 - lw...@suse.com
+
+- fix cluster-init to init sbd configuration with new style(bnc#881484)
+ Add: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch
+
+-------------------------------------------------------------------
+Mon Jun 9 08:57:56 UTC 2014 - kgronl...@suse.com
+
+- Make check for no-quorum-policy=ignore slighty less rigid
+- Add /etc/drbd.conf to csync2 configuration (bnc#881683)
+
+- Add 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch
+- Add 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch
+
+-------------------------------------------------------------------
New:
----
0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch
0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch
fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.nJxb3C/_old 2014-06-16 21:26:41.000000000 +0200
+++ /var/tmp/diff_new_pack.nJxb3C/_new 2014-06-16 21:26:41.000000000 +0200
@@ -25,6 +25,13 @@
Group: Productivity/Clustering/HA
Url: https://github.com/tserong/sleha-bootstrap
Source: sleha-bootstrap-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM: Make check for no-quorum-policy=ignore less strict
+Patch1: 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch
+# PATCH-FIX-UPSTREAM: Add /etc/drbd.conf to csync2 configuration (bnc#881683)
+Patch2: 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch
+# PATCH-FIX: fix ha-cluster-init to init sbd configuration with new
style(bnc#881484)
+Patch3: fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch
+
Requires: csync2
Requires: hawk
Requires: iproute2
@@ -42,6 +49,9 @@
%prep
%setup -n sleha-bootstrap-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%install
++++++ 0001-Make-check-for-no-quorum-policy-ignore-slighty-less-.patch ++++++
>From cebe9b42ef9eb3c08823b1f881bafc3cea842518 Mon Sep 17 00:00:00 2001
From: Tim Serong <tser...@suse.com>
Date: Wed, 4 Jun 2014 18:10:28 +1000
Subject: [PATCH 1/2] Make check for no-quorum-policy=ignore slighty less rigid
Signed-off-by: Tim Serong <tser...@suse.com>
---
scripts/ha-cluster-join | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/ha-cluster-join b/scripts/ha-cluster-join
index 62af82822745..f2008fa4e725 100755
--- a/scripts/ha-cluster-join
+++ b/scripts/ha-cluster-join
@@ -192,7 +192,7 @@ join_cluster()
invoke corosync-cfgtool -R
# Ditch no-quorum-policy=ignore if we're going over two nodes
- if [ $new_quorum -gt 2 ] && crm configure show | grep -q
no-quorum-policy=ignore ; then
+ if [ $new_quorum -gt 2 ] && crm configure show | grep -q
'no-quorum-policy=.*ignore' ; then
invoke crm_attribute --attr-name no-quorum-policy --delete-attr
fi
}
--
1.8.4.5
++++++ 0002-Add-etc-drbd.conf-to-csync2-configuration-bnc-881683.patch ++++++
>From 6aa2d3d30e3cb446f6c32f0c86e967a0c5666c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Mon, 9 Jun 2014 10:53:40 +0200
Subject: [PATCH 2/2] Add /etc/drbd.conf to csync2 configuration (bnc#881683)
---
scripts/ha-cluster-init | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init
index e036ee59917f..66e94f7988b6 100755
--- a/scripts/ha-cluster-init
+++ b/scripts/ha-cluster-init
@@ -127,6 +127,7 @@ group ha_group
include /etc/csync2/csync2.cfg;
include /etc/csync2/key_hagroup;
include /etc/ctdb/nodes;
+ include /etc/drbd.conf;
include /etc/drbd.d;
include /etc/ha.d/ldirectord.cf;
include /etc/lvm/lvm.conf;
--
1.8.4.5
++++++ fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch ++++++
Index: sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init
===================================================================
--- sleha-bootstrap-0.4+git.1396958965.7f1629a.orig/scripts/ha-cluster-init
+++ sleha-bootstrap-0.4+git.1396958965.7f1629a/scripts/ha-cluster-init
@@ -458,8 +458,45 @@ Configure SBD:
local tmp_conf=$SYSCONFIG_SBD.$$
cat > $tmp_conf <<END
+## Type: string
+## Default: ""
+#
+# SBD_DEVICE specifies the devices to use for exchanging sbd messages
+# and to monitor. If specifying more than one path, use ";" as
+# separator.
+#
SBD_DEVICE="$SBD_DEVICE"
-SBD_OPTS="-W"
+
+## Type: yesno
+## Default: yes
+#
+# Whether to enable the pacemaker integration.
+#
+SBD_PACEMAKER=
+
+## Type: list(always,clean)
+## Default: always
+#
+# Specify the start mode for sbd. Setting this to "clean" will only
+# allow sbd to start if it was not previously fenced. See the -S option
+# in the man page.
+#
+SBD_STARTMODE=
+
+## Type: yesno
+## Default: yes
+#
+# Whether to use a watchdog.
+#
+SBD_WATCHDOG=
+
+## Type: string
+## Default: ""
+#
+# Additional options for starting sbd
+#
+SBD_OPTS=
+
END
install_tmp $tmp_conf $SYSCONFIG_SBD
invoke csync2 -m $SYSCONFIG_SBD
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
