Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2015-05-06 07:48:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-17 17:26:37.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2015-05-06 07:48:39.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Apr 21 11:10:39 UTC 2015 - kgronl...@suse.com
+
+- Updated IP address detection fix (boo#920226)
+
+-------------------------------------------------------------------
+Tue Apr 21 05:59:07 UTC 2015 - kgronl...@suse.com
+
+- Improved IP address detection algorithm (boo#920226)
+- Use crm_node to count nodes in cluster when deciding
+ to reset no-quorum-policy=ignore (boo#923372)
+- Add 0001-Improved-IP-address-detection-algorithm-boo-920226.patch
+- Add 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch
+
+
+-------------------------------------------------------------------
New:
----
0001-Improved-IP-address-detection-algorithm-boo-920226.patch
0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.0Cjkib/_old 2015-05-06 07:48:40.000000000 +0200
+++ /var/tmp/diff_new_pack.0Cjkib/_new 2015-05-06 07:48:40.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ha-cluster-bootstrap
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010-2011 Novell Inc. All Rights Reserved.
#
# All modifications and additions to the file contributed by third parties
@@ -26,6 +26,12 @@
Url: https://github.com/tserong/sleha-bootstrap
Source: sleha-bootstrap-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM: Improved IP address detection algorithm (boo#920226)
+Patch1: 0001-Improved-IP-address-detection-algorithm-boo-920226.patch
+# PATCH-FIX-UPSTREAM: Use crm_node to count nodes in cluster when deciding
+# to reset no-quorum-policy=ignore (boo#923372)
+Patch2: 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch
+
Requires: csync2
Requires: hawk
Requires: iproute2
@@ -43,6 +49,8 @@
%prep
%setup -n sleha-bootstrap-%{version}
+%patch1 -p1
+%patch2 -p1
%build
%install
++++++ 0001-Improved-IP-address-detection-algorithm-boo-920226.patch ++++++
>From 75cbe460fab9e17ab99427f072dbc01893016f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Wed, 25 Mar 2015 20:47:08 +0100
Subject: [PATCH 1/2] Improved IP address detection algorithm (boo#920226)
Use alternate IP address detection method which also works
for peer-to-peer interfaces with a /32 netmask.
Resolves: boo#920226
---
scripts/ha-cluster-functions | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/ha-cluster-functions b/scripts/ha-cluster-functions
index 66e11ce..d82290a 100644
--- a/scripts/ha-cluster-functions
+++ b/scripts/ha-cluster-functions
@@ -503,9 +503,7 @@ init_network()
# up. If $IP_ADDRESS is overridden, network detect shouldn't work,
# because "ip route" won't be able to help us.
if [ -z "$IP_ADDRESS" ]; then
- IP_ADDRESS=$(ip -o -f inet addr show primary | \
- awk "/[[:space:]]${NET_IF}[[:space:]]/ {print \$4} " |
- sed 's/\/[0-9]\+//')
+ IP_ADDRESS=$(ip route get 1 oif $NET_IF | head -1 | awk '{print
$NF}')
fi
if [ -z "$IP_NETWORK" -a -n "$IP_ADDRESS" ]; then
IP_NETWORK=$(ip route list | \
--
2.1.4
++++++ 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch ++++++
>From 1362d3e60a2a890b519f13f55a4a7ecb7af2312b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Mon, 23 Mar 2015 09:54:27 +0100
Subject: [PATCH 2/2] Use crm_node to count nodes in cluster when deciding to
reset no-quorum-policy=ignore (boo#923372)
---
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 863c06c..eca2cf8 100755
--- a/scripts/ha-cluster-join
+++ b/scripts/ha-cluster-join
@@ -219,7 +219,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 [ $(crm_node -l | sed '/^$/d' | wc -l) -gt 2 ] && crm configure show
| grep -q 'no-quorum-policy=.*ignore' ; then
invoke crm_attribute --attr-name no-quorum-policy --delete-attr
fi
}
--
2.1.4
