Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2014-02-28 16:25:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-02-18 14:44:37.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2014-02-28 16:25:06.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Feb 28 05:13:43 UTC 2014 - [email protected]
+
+- Use netstat to guess at the default route interface (bnc#854172)
+- Don't add service section to corosync.conf (bnc#865041)
+- Set corosync logging to_logfile: no
+- Correctly detect unconfigured SBD when SBD_DEVICE="" (bnc#865260)
+- Upstream version cs:37debd0
+
+-------------------------------------------------------------------
Old:
----
sleha-bootstrap-0.4+git.1392700725.6daed36.tar.bz2
New:
----
sleha-bootstrap-0.4+git.1393474526.37debd0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.btYLbh/_old 2014-02-28 16:25:07.000000000 +0100
+++ /var/tmp/diff_new_pack.btYLbh/_new 2014-02-28 16:25:07.000000000 +0100
@@ -18,7 +18,7 @@
Name: ha-cluster-bootstrap
-Version: 0.4+git.1392700725.6daed36
+Version: 0.4+git.1393474526.37debd0
Release: 0
Summary: Pacemaker HA Cluster Bootstrap Tool
License: GPL-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.btYLbh/_old 2014-02-28 16:25:07.000000000 +0100
+++ /var/tmp/diff_new_pack.btYLbh/_new 2014-02-28 16:25:07.000000000 +0100
@@ -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">6daed36</param>
+ <param name="revision">37debd0</param>
</service>
<service name="recompress" mode="disabled">
++++++ sleha-bootstrap-0.4+git.1392700725.6daed36.tar.bz2 ->
sleha-bootstrap-0.4+git.1393474526.37debd0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-functions
new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-functions
--- old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-functions
2014-02-14 13:31:38.000000000 +0100
+++ new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-functions
2014-02-28 06:13:11.000000000 +0100
@@ -36,7 +36,7 @@
declare BE_QUIET=false
declare YES_TO_ALL=false
-declare NET_IF=eth0
+declare NET_IF="$(netstat -nr | grep '^0.0.0.0' | awk '{print ($(NF))}'
2>/dev/null)"
declare IP_ADDRESS
declare IP_NETWORK
@@ -125,6 +125,14 @@
status_done
}
+# Gets currently configured SBD device, i.e. what's in /etc/sysconfig/sbd
+# (deliberately run in a subshell so as to not pollute global namespace)
+configured_sbd_device()
+(
+ [ -f "$SYSCONFIG_SBD" ] && . $SYSCONFIG_SBD
+ echo $SBD_DEVICE
+)
+
# Configure /etc/sysconfig/SuSEfirewall2.d/services/cluster in much the same
# way as yast2-cluster does. If that file doesn't exist but the firewall is
# on, warn the user that they'll need to configure things manually (the
@@ -218,8 +226,10 @@
[ -n "$pass_msg" ] && \
warn "You should change the hacluster password to something
more secure!"
- if [ -f "$SYSCONFIG_SBD" ] && grep -q '^SBD_DEVICE=' $SYSCONFIG_SBD;
then
+ if [ -n "$(configured_sbd_device)" ]; then
invoke systemctl enable sbd.service
+ else
+ invoke systemctl disable sbd.service
fi
start_service pacemaker.service
wait_for_cluster
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-init
new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-init
--- old/sleha-bootstrap-0.4+git.1392700725.6daed36/scripts/ha-cluster-init
2014-02-14 13:31:38.000000000 +0100
+++ new/sleha-bootstrap-0.4+git.1393474526.37debd0/scripts/ha-cluster-init
2014-02-28 06:13:11.000000000 +0100
@@ -236,10 +236,6 @@
cat > $tmp_conf <<END
# Please read the corosync.conf.5 manual page
-service {
- ver: 1
- name: pacemaker
-}
totem {
version: 2
secauth: off
@@ -269,7 +265,7 @@
logging {
fileline: off
to_stderr: no
- to_logfile: yes
+ to_logfile: no
logfile: /var/log/cluster/corosync.log
to_syslog: yes
debug: off
@@ -414,7 +410,7 @@
specify here will be destroyed.
"
- if [ -f "$SYSCONFIG_SBD" ] && grep -q '^SBD_DEVICE='
$SYSCONFIG_SBD; then
+ if [ -n "$(configured_sbd_device)" ]; then
confirm \
"SBD is already configured - overwrite?" ||
return
fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
