Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2014-09-17 17:26:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03 19:57:34.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2014-09-17 17:26:37.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 16 08:16:23 UTC 2014 - kgronl...@suse.com
+
+- Silence grep when checking SBD config (bnc#895992)
+- Drop merged patches:
+ + Remove 0001-sbd_init_with_new_style.patch
+ + Remove 0002-clean-up-multiline-warnings.patch
+- Upstream version cs:8459115
+
+-------------------------------------------------------------------
Old:
----
0001-sbd_init_with_new_style.patch
0002-clean-up-multiline-warnings.patch
sleha-bootstrap-0.4+git.1408418098.8d38b0b.tar.bz2
New:
----
sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.TlEcTN/_old 2014-09-17 17:26:38.000000000 +0200
+++ /var/tmp/diff_new_pack.TlEcTN/_new 2014-09-17 17:26:38.000000000 +0200
@@ -18,17 +18,13 @@
Name: ha-cluster-bootstrap
-Version: 0.4+git.1408418098.8d38b0b
+Version: 0.4+git.1410854324.8459115
Release: 0
Summary: Pacemaker HA Cluster Bootstrap Tool
License: GPL-2.0
Group: Productivity/Clustering/HA
Url: https://github.com/tserong/sleha-bootstrap
Source: sleha-bootstrap-%{version}.tar.bz2
-# 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
@@ -47,8 +43,6 @@
%prep
%setup -n sleha-bootstrap-%{version}
-%patch6 -p1
-%patch7 -p1
%build
%install
++++++ _service ++++++
--- /var/tmp/diff_new_pack.TlEcTN/_old 2014-09-17 17:26:38.000000000 +0200
+++ /var/tmp/diff_new_pack.TlEcTN/_new 2014-09-17 17:26:38.000000000 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">0.4+git.%ct.%h</param>
- <param name="revision">8d38b0b</param>
+ <param name="revision">8459115</param>
</service>
<service name="recompress" mode="disabled">
++++++ sleha-bootstrap-0.4+git.1408418098.8d38b0b.tar.bz2 ->
sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-functions
new/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions
--- old/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-functions
2014-08-19 13:58:22.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions
2014-09-16 10:16:03.000000000 +0200
@@ -184,8 +184,7 @@
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 @@
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 @@
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 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-init
new/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-init
--- old/sleha-bootstrap-0.4+git.1408418098.8d38b0b/scripts/ha-cluster-init
2014-08-19 13:58:22.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-init
2014-09-16 10:16:03.000000000 +0200
@@ -456,6 +456,11 @@
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 @@
invoke sbd -d $SBD_DEVICE create || error "Failed to initialize SBD
device"
status_done
- local tmp_conf=$SYSCONFIG_SBD.$$
- cat > $tmp_conf <<END
-SBD_DEVICE="$SBD_DEVICE"
-SBD_OPTS="-W"
-END
- install_tmp $tmp_conf $SYSCONFIG_SBD
+ if [ -f $SYSCONFIG_SBD ]; then
+ if grep -E '^SBD_DEVICE=.*' $SYSCONFIG_SBD >/dev/null 2>&1; then
+ sed -i -e
"s%^SBD_DEVICE=.*%SBD_DEVICE=\"$SBD_DEVICE\"%g" $SYSCONFIG_SBD
+ else
+ echo "SBD_DEVICE=\"$SBD_DEVICE\"" >> $SYSCONFIG_SBD
+ fi
+ if grep -E '^SBD_WATCHDOG=.*' $SYSCONFIG_SBD >/dev/null 2>&1;
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
