Hello community,
here is the log from the commit of package ha-cluster-bootstrap for openSUSE:Factory checked in at 2014-09-03 18:21:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-25 11:03:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes 2014-09-03 19:57:34.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Aug 27 08:10:27 UTC 2014 - kgronlund@suse.com
+
+- Fix ha-cluster-init to init sbd configuration with new style (bnc#881484)
+- Clean up multiline warnings (bnc#885411)
+- Clean up patches:
+ - Added 0001-sbd_init_with_new_style.patch
+ - Added 0002-clean-up-multiline-warnings.patch
+ - Removed fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch
+ - Removed improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch
+ - Removed fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch
+
+-------------------------------------------------------------------
Old:
----
fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch
fix-ha-cluster-init-sbd-with-new-style-bnc-881484.patch
improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch
New:
----
0001-sbd_init_with_new_style.patch
0002-clean-up-multiline-warnings.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.Y6HWkq/_old 2014-09-03 19:57:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Y6HWkq/_new 2014-09-03 19:57:36.000000000 +0200
@@ -25,12 +25,10 @@
Group: Productivity/Clustering/HA
Url: https://github.com/tserong/sleha-bootstrap
Source: sleha-bootstrap-%{version}.tar.bz2
-# 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
-# PATCH-IMPROVE: improve ha-cluster-init to check sbd watchdog
-Patch4: improve-ha-cluster-init-check-sbd-watchdog-bnc-881484.patch
-# PATCH-FIX:
-Patch5: fix-ha-cluster-init-not-to-overwrite-sbd-conf-881484.patch
+# PATCH-FIX-UPSTREAM: Fix ha-cluster-init to init sbd configuration with new style (bnc#881484)
+Patch6: 0001-sbd_init_with_new_style.patch
+# PATCH-FIX-UPSTREAM: Clean up multiline warnings (bnc#885411)
+Patch7: 0002-clean-up-multiline-warnings.patch
Requires: csync2
Requires: hawk
@@ -49,9 +47,8 @@
%prep
%setup -n sleha-bootstrap-%{version}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
%install
++++++ 0001-sbd_init_with_new_style.patch ++++++
commit 281cee3f7fdd5aa06ace701c16b8c8cebca8d43d
Author: Liuhua Wang
Date: Thu Aug 21 15:19:01 2014 +0200
Fix ha-cluster-init to init sbd configuration with new style (bnc#881484)
diff --git a/scripts/ha-cluster-init b/scripts/ha-cluster-init
index 88bced4..75f4ede 100755
--- a/scripts/ha-cluster-init
+++ b/scripts/ha-cluster-init
@@ -456,6 +456,11 @@ Configure SBD:
fi
done
SBD_DEVICE="$dev"
+
+ SBD_WATCHDOG="yes"
+ if ! check_watchdog; then
+ warn "No watchdog device detected! SBD will not work without a watchdog."
+ fi
fi
[ -b "$SBD_DEVICE" ] || error "SBD device $SBD_DEVICE does not exist"
@@ -467,12 +472,22 @@ Configure SBD:
invoke sbd -d $SBD_DEVICE create || error "Failed to initialize SBD device"
status_done
- local tmp_conf=$SYSCONFIG_SBD.$$
- cat > $tmp_conf <> $SYSCONFIG_SBD
+ fi
+ if grep -E '^SBD_WATCHDOG=.*' $SYSCONFIG_SBD; then
+ sed -i -e "s/^SBD_WATCHDOG=.*/SBD_WATCHDOG=$SBD_WATCHDOG/g" $SYSCONFIG_SBD
+ else
+ echo "SBD_WATCHDOG=\"$SBD_WATCHDOG\"" >> $SYSCONFIG_SBD
+ fi
+ else
+ echo "SBD_DEVICE=\"$SBD_DEVICE\"" > $SYSCONFIG_SBD
+ echo "SBD_WATCHDOG=\"$SBD_WATCHDOG\"" >> $SYSCONFIG_SBD
+ fi
+
invoke csync2 -m $SYSCONFIG_SBD
invoke csync2 -f $SYSCONFIG_SBD
invoke csync2 -xv $SYSCONFIG_SBD
++++++ 0002-clean-up-multiline-warnings.patch ++++++
commit 743f181a0c0579068fa4a984b16f8b443029d7b0
Author: Kristoffer Grönlund
Date: Tue Aug 26 10:38:31 2014 +0200
Clean up multiline warnings (bnc#885411)
diff --git a/scripts/ha-cluster-functions b/scripts/ha-cluster-functions
index 91be3d2..12955ae 100644
--- a/scripts/ha-cluster-functions
+++ b/scripts/ha-cluster-functions
@@ -184,8 +184,7 @@ init_firewall()
invoke rcSuSEfirewall2 restart \
|| error "Failed to restart firewall"
else
- warn "Firewall is active - you may need to open ports:"
- warn " TCP $tcp"
+ warn "Firewall is active. You may need to open these TCP ports: $tcp"
fi
}
@@ -220,8 +219,7 @@ init_firewall_corosync()
invoke rcSuSEfirewall2 restart \
|| error "Failed to restart firewall"
else
- warn "Firewall is active - you may need to open ports:"
- warn " UDP ${udp:-none}"
+ warn "Firewall is active. You may need to open these UDP ports: ${udp:-none}"
fi
}
@@ -431,13 +429,22 @@ _onexit()
exit $rc
}
+check_watchdog()
+{
+ watchdog_dev=$(cat /etc/modules-load.d/watchdog.conf 2>&1|grep watchdog-device |cut -d"=" -f2 >/dev/null 2>&1)
+ if [ -z "$watchdog_dev" ]; then
+ watchdog_dev="/dev/watchdog"
+ fi
+
+ wdctl $watchdog_dev >/dev/null 2>&1
+}
+
check_prereqs()
{
local -i warned=0
if ! my_hostname_resolves ; then
- warn "Hostname '$(hostname)' is unresolvable - csync2 won't work."
- warn "You should add an entry to /etc/hosts or configure DNS."
+ warn "Hostname '$(hostname)' is unresolvable - csync2 won't work. Please add an entry to /etc/hosts or configure DNS."
warned=1
fi
@@ -451,9 +458,8 @@ check_prereqs()
warned=1
fi
- if ! [ -c /dev/watchdog ] ; then
- warn "There does not appear to be a watchdog device. If you use"
- warn "SBD the cluster will be unable to start without a watchdog."
+ if ! check_watchdog ; then
+ warn "No watchdog device found. If SBD is used, the cluster will be unable to start without a watchdog."
warned=1
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org