Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-05-22 20:38:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old)
and /work/SRC/openSUSE:Factory/.cluster-glue.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes
2014-04-25 11:33:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-05-22 20:39:09.000000000 +0200
@@ -1,0 +2,30 @@
+Tue May 20 09:25:18 UTC 2014 - jseg...@novell.com
+
+- added service_add_pre to spec file
+- removed .<CI_CNT>.<B_CNT> from the release tag
+
+-------------------------------------------------------------------
+Thu May 8 11:41:07 CEST 2014 - r...@suse.de
+
+- Add cluster-glue-configure-statedir.patch
+ * use _rundir macro and define GLUE_STATE_DIR accordingly
+
+-------------------------------------------------------------------
+Mon May 5 09:03:29 UTC 2014 - kgronl...@suse.com
+
+- Drop rc1 from release numbering (bnc#873456)
+
+-------------------------------------------------------------------
+Fri May 2 15:25:24 UTC 2014 - dmuhameda...@suse.com
+
+- hb_report: fix ssh passwords for clusters larger than 2 (bnc#867365)
+- upstream cs: b44fe9e0c67e
+ * removed obsolete Low-hb_report-pcmk-lib-changed-permissions.patch
(upstream)
+ * removed obsolete
0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch (upstream)
+ * removed obsolete 0002-hb_report-Update-FSF-address-in-license.patch
(upstream)
+ * removed obsolete bnc863248-logd-add-systemd-support.patch (upstream)
+ * removed obsolete
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
(upstream)
+ * removed obsolete bnc854060_hb_report-add-xz-support.patch (upstream)
+ * removed obsolete ipmilan-ipmiif.patch (upstream)
+
+-------------------------------------------------------------------
Old:
----
0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
0002-hb_report-Update-FSF-address-in-license.patch
Low-hb_report-pcmk-lib-changed-permissions.patch
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
bnc854060_hb_report-add-xz-support.patch
bnc863248-logd-add-systemd-support.patch
ipmilan-ipmiif.patch
New:
----
cluster-glue-configure-statedir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cluster-glue.spec ++++++
--- /var/tmp/diff_new_pack.eEPu5W/_old 2014-05-22 20:39:11.000000000 +0200
+++ /var/tmp/diff_new_pack.eEPu5W/_new 2014-05-22 20:39:11.000000000 +0200
@@ -16,7 +16,7 @@
#
-%global glue_release 0.rc1
+%global glue_release 1
%define uid 90
%define gname haclient
@@ -40,24 +40,18 @@
License: GPL-2.0 and LGPL-2.1+
Group: Productivity/Clustering/HA
Version: 1.0.12
-Release: %{?glue_release}.<CI_CNT>.<B_CNT>
+Release: %{?glue_release}
Url: http://www.linux-ha.org/wiki/Cluster_Glue
Source: cluster-glue.tar.bz2
Source2: baselibs.conf
+# PATCH-FIX-OPENSUSE: load libplumb symbols manually (thanks to lge)
(bnc#694243)
Patch1: bug-694243_cluster-glue_symbol-conflict.patch
+# PATCH-FIX-OPENSUSE: use absolute path when invoking slaves (bnc#662816)
Patch2: bnc662816_cluster-glue_hb_report_abspath.patch
+# PATCH-FIX-OPENSUSE: drop lrm as it's not used anymore by pacemaker
Patch4: cluster-glue_droplrm.patch
-Patch5: ipmilan-ipmiif.patch
-Patch6:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
-Patch7: bnc854060_hb_report-add-xz-support.patch
-Patch8: bnc863248-logd-add-systemd-support.patch
-# PATCH-FIX-UPSTREAM: hb_report: Don't use deprecated corosync-fplay
(bnc#870913)
-Patch9: 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
-# PATCH-FIX-UPSTREAM: hb_report: Update FSF address in license
-Patch10: 0002-hb_report-Update-FSF-address-in-license.patch
-# PATCH-FIX-UPSTREAM: hb_report: pcmk lib changed permissions (bnc#872958)
-Patch11: Low-hb_report-pcmk-lib-changed-permissions.patch
-
+# PATCH-FIX-OPENSUSE: use _rundir macro and define GLUE_STATE_DIR accordingly
+Patch5: cluster-glue-configure-statedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -107,6 +101,10 @@
BuildRequires: libcurl-devel
%endif
+%if ! %{defined _rundir}
+%define _rundir %{_localstatedir}/run
+%endif
+
%description
A collection of common tools that are useful for writing cluster managers
such as Pacemaker.
@@ -161,12 +159,6 @@
%patch2 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
###########################################################
%build
@@ -193,6 +185,7 @@
%if %{defined _unitdir}
--with-systemdsystemunitdir=%{_unitdir} \
%endif
+ --with-rundir=%{_rundir} \
--docdir=%{glue_docdir}
%endif
make %{?_smp_mflags}
@@ -229,6 +222,9 @@
-d %{_var}/lib/heartbeat/cores/%{uname} -o -u %{uid} \
%{uname} 2>/dev/null || :
fi
+%if %{defined _unitdir}
+ %service_add_pre logd.service
+%endif
%if %{defined _unitdir}
%post
++++++ cluster-glue-configure-statedir.patch ++++++
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,15 @@
[ GLUE_DAEMON_USER="hacluster" ],
)
+
+AC_ARG_WITH(
+ rundir,
+ [ --with-rundir=DIR
+ directory to store state information
[default=localstatedir/run] ],
+ [ GLUE_STATE_DIR="$withval" ],
+ [ GLUE_STATE_DIR="${localstatedir}/run" ],
+ )
+
dnl ===============================================
dnl General Processing
dnl ===============================================
++++++ cluster-glue.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/.hg_archival.txt
new/cluster-glue/.hg_archival.txt
--- old/cluster-glue/.hg_archival.txt 2013-10-31 13:09:50.000000000 +0100
+++ new/cluster-glue/.hg_archival.txt 2014-05-02 17:18:58.000000000 +0200
@@ -1,5 +1,5 @@
repo: e3ffdd7ae81c596b2be7e1e110d2c1255161340e
-node: b5f1605097857b8b96bd517282ab300e2ad7af99
+node: b44fe9e0c67ec6d0a958147bab14f75324e16691
branch: default
latesttag: glue-1.0.12-rc1
-latesttagdistance: 4
+latesttagdistance: 12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/Makefile.am new/cluster-glue/Makefile.am
--- old/cluster-glue/Makefile.am 2013-10-31 13:09:50.000000000 +0100
+++ new/cluster-glue/Makefile.am 2014-05-02 17:18:58.000000000 +0200
@@ -16,6 +16,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure DRF/config-h.in \
DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/configure.ac
new/cluster-glue/configure.ac
--- old/cluster-glue/configure.ac 2013-10-31 13:09:50.000000000 +0100
+++ new/cluster-glue/configure.ac 2014-05-02 17:18:58.000000000 +0200
@@ -52,6 +52,22 @@
[ --with-pkg-name=name Override package name (if you're a packager
needing to pretend) ],
[ PACKAGE_NAME="$withval" ])
+PKG_PROG_PKG_CONFIG
+AC_ARG_WITH([systemdsystemunitdir],
+ [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd
service files])],,
+ [with_systemdsystemunitdir=auto])
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o
"x$with_systemdsystemunitdir" = "xauto"], [
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir
systemd)
+
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
+ [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
+ [AC_MSG_ERROR([systemd support requested but pkg-config unable
to query systemd package])])
+ with_systemdsystemunitdir=no],
+ [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
+ [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+
AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
AC_DEFINE_UNQUOTED(GLUE_VERSION, "$PACKAGE_VERSION", Current version of the
glue library)
@@ -1368,6 +1384,7 @@
lrm/test/testcases/Makefile \
logd/Makefile \
logd/logd \
+logd/logd.service \
replace/Makefile \
hb_report/Makefile \
hb_report/hb_report \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/combine-logs.pl
new/cluster-glue/hb_report/combine-logs.pl
--- old/cluster-glue/hb_report/combine-logs.pl 2013-10-31 13:09:50.000000000
+0100
+++ new/cluster-glue/hb_report/combine-logs.pl 2014-05-02 17:18:58.000000000
+0200
@@ -9,10 +9,10 @@
#
# usage: combine-logs <log file> [...]
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
#
# Note by Dejan Muhamedagic <de...@suse.de>
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/ha_cf_support.sh
new/cluster-glue/hb_report/ha_cf_support.sh
--- old/cluster-glue/hb_report/ha_cf_support.sh 2013-10-31 13:09:50.000000000
+0100
+++ new/cluster-glue/hb_report/ha_cf_support.sh 2014-05-02 17:18:58.000000000
+0200
@@ -76,7 +76,7 @@
cat<<EOF
d $HA_VARLIB 0755 root root
d $HA_VARLIB/ccm 0750 hacluster haclient
-d $PCMK_LIB 0755 root root
+d $PCMK_LIB 0750 hacluster haclient
d $PE_STATE_DIR 0750 hacluster haclient
d $CIB_DIR 0750 hacluster haclient
EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/hb_report.in
new/cluster-glue/hb_report/hb_report.in
--- old/cluster-glue/hb_report/hb_report.in 2013-10-31 13:09:50.000000000
+0100
+++ new/cluster-glue/hb_report/hb_report.in 2014-05-02 17:18:58.000000000
+0200
@@ -36,6 +36,7 @@
LOGD_CF=`findlogdcf @sysconfdir@ $HA_DIR`
export LOGD_CF
+SSH_PASSWORD_NODES=""
: ${SSH_OPTS="-o StrictHostKeyChecking=no -o EscapeChar=none"}
LOG_PATTERNS="CRIT: ERROR:"
# PEINPUTS_PATT="peng.*PEngine Input stored"
@@ -315,7 +316,9 @@
#
find_decompressor() {
- if echo $1 | grep -qs 'bz2$'; then
+ if echo $1 | grep -qs 'xz$'; then
+ echo "xz -dc"
+ elif echo $1 | grep -qs 'bz2$'; then
echo "bzip2 -dc"
elif echo $1 | grep -qs 'gz$'; then
echo "gzip -dc"
@@ -561,19 +564,27 @@
#
# does ssh work?
# and how
+# test the provided ssh user
+# or try to find a ssh user which works without password
+# if ssh works without password, we can run the collector in the
+# background and save some time
#
testsshconn() {
ssh $SSH_OPTS -T -o Batchmode=yes $1 true 2>/dev/null
}
findsshuser() {
local n u rc
- local ssh_s ssh_user="__undef" try_user_list failed_nodes=""
- try_user_list="\"\" $TRY_SSH"
+ local ssh_s ssh_user="__undef" try_user_list
+ if [ -z "$SSH_USER" ]; then
+ try_user_list="__default $TRY_SSH"
+ else
+ try_user_list="$SSH_USER"
+ fi
for n in $NODES; do
rc=1
[ "$n" = "$WE" ] && continue
for u in $try_user_list; do
- if [ "$u" != '""' ]; then
+ if [ "$u" != '__default' ]; then
ssh_s=$u@$n
else
ssh_s=$n
@@ -589,20 +600,34 @@
fi
done
[ $rc = 1 ] &&
- failed_nodes="$failed_nodes $n"
+ SSH_PASSWORD_NODES="$SSH_PASSWORD_NODES $n"
done
- [ -n "$failed_nodes" ] &&
- warning "ssh to node(s) $failed_nodes does not work"
- # drop nodes we cannot reach
- NODES=`for n in $failed_nodes $NODES; do echo $n; done | sort | uniq -u`
+ if [ -n "$SSH_PASSWORD_NODES" ]; then
+ warning "passwordless ssh to node(s) $SSH_PASSWORD_NODES does
not work"
+ fi
+
if [ "$ssh_user" = "__undef" ]; then
return 1
fi
- if [ "$ssh_user" != '""' ]; then
- echo $ssh_user
+ if [ "$ssh_user" != "__default" ]; then
+ SSH_USER=$ssh_user
fi
return 0
}
+node_needs_pwd() {
+ local n
+ for n in $SSH_PASSWORD_NODES; do
+ [ "$n" = "$1" ] && return 0
+ done
+ return 1
+}
+say_ssh_user() {
+ if [ -n "$SSH_USER" ]; then
+ echo $SSH_USER
+ else
+ echo your user
+ fi
+}
#
# the usual stuff
@@ -681,7 +706,7 @@
local inpf
inpf=`find_files /var/lib/corosync $from_time $to_time | grep -w fdata`
if [ -f "$inpf" ]; then
- corosync-fplay > $outf
+ corosync-blackbox > $outf
touch -r $inpf $outf
fi
}
@@ -1018,8 +1043,10 @@
fi
}
pickcompress() {
- if COMPRESS_PROG=`pickfirst bzip2 gzip`; then
- if [ "$COMPRESS_PROG" = bzip2 ]; then
+ if COMPRESS_PROG=`pickfirst bzip2 gzip xz`; then
+ if [ "$COMPRESS_PROG" = xz ]; then
+ COMPRESS_EXT=.xz
+ elif [ "$COMPRESS_PROG" = bzip2 ]; then
COMPRESS_EXT=.bz2
else
COMPRESS_EXT=.gz
@@ -1344,9 +1371,7 @@
if [ -z "$NO_SSH" ]; then
# if the ssh user was supplied, consider that it
# works; helps reduce the number of ssh invocations
- if [ -z "$SSH_USER" ]; then
- SSH_USER=`findsshuser`
- fi
+ findsshuser
if [ -n "$SSH_USER" ]; then
SSH_OPTS="$SSH_OPTS -o User=$SSH_USER"
fi
@@ -1383,11 +1408,13 @@
if ! is_collector; then
for node in $NODES; do
- if [ -z "$SSH_USER" ]; then
+ if node_needs_pwd $node; then
+ info "Please provide password for `say_ssh_user` at
$node"
+ info "Note that collecting data will take a while."
+ start_slave_collector $node
+ else
start_slave_collector $node &
SLAVEPIDS="$SLAVEPIDS $!"
- else
- start_slave_collector $node
fi
done
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/hb_report/openais_conf_support.sh
new/cluster-glue/hb_report/openais_conf_support.sh
--- old/cluster-glue/hb_report/openais_conf_support.sh 2013-10-31
13:09:50.000000000 +0100
+++ new/cluster-glue/hb_report/openais_conf_support.sh 2014-05-02
17:18:58.000000000 +0200
@@ -90,7 +90,7 @@
}
essential_files() {
cat<<EOF
-d $PCMK_LIB 0755 root root
+d $PCMK_LIB 0750 hacluster haclient
d $PE_STATE_DIR 0750 hacluster haclient
d $CIB_DIR 0750 hacluster haclient
EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/external/vcenter
new/cluster-glue/lib/plugins/stonith/external/vcenter
--- old/cluster-glue/lib/plugins/stonith/external/vcenter 2013-10-31
13:09:50.000000000 +0100
+++ new/cluster-glue/lib/plugins/stonith/external/vcenter 2014-05-02
17:18:58.000000000 +0200
@@ -106,6 +106,16 @@
Allowed values: 0, 1
</longdesc>
</parameter>
+<parameter name="PERL_LWP_SSL_VERIFY_HOSTNAME">
+<content type="string"/>
+<shortdesc lang="en">Enable or disable SSL hostname verification</shortdesc>
+<longdesc lang="en">
+To disable SSL hostname verification set this option to 0.
+To enable hostname verification, set this option to 1.
+This option is actually part of the LWP Perl library.
+See LWP(3pm) for more information.
+</longdesc>
+</parameter>
</parameters>} . "\n";
}
else { dielog("Invalid command specified: $command\n"); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/lib/plugins/stonith/ipmilan_command.c
new/cluster-glue/lib/plugins/stonith/ipmilan_command.c
--- old/cluster-glue/lib/plugins/stonith/ipmilan_command.c 2013-10-31
13:09:50.000000000 +0100
+++ new/cluster-glue/lib/plugins/stonith/ipmilan_command.c 2014-05-02
17:18:58.000000000 +0200
@@ -28,6 +28,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <OpenIPMI/ipmiif.h>
#include <OpenIPMI/selector.h>
#include <OpenIPMI/ipmi_conn.h>
#include <OpenIPMI/ipmi_lan.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/logd/Makefile.am
new/cluster-glue/logd/Makefile.am
--- old/cluster-glue/logd/Makefile.am 2013-10-31 13:09:50.000000000 +0100
+++ new/cluster-glue/logd/Makefile.am 2014-05-02 17:18:58.000000000 +0200
@@ -48,5 +48,9 @@
logtest_SOURCES = logtest.c
logtest_LDADD = $(top_builddir)/lib/clplumbing/libplumb.la
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = \
+ logd.service
+else
initd_SCRIPTS = logd
-
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/logd/ha_logd.c
new/cluster-glue/logd/ha_logd.c
--- old/cluster-glue/logd/ha_logd.c 2013-10-31 13:09:50.000000000 +0100
+++ new/cluster-glue/logd/ha_logd.c 2014-05-02 17:18:58.000000000 +0200
@@ -637,7 +637,7 @@
gboolean ret = TRUE;
if ((f = fopen(cfgfile, "r")) == NULL){
- cl_perror("Cannot open config file [%s]", cfgfile);
+ cl_log(LOG_WARNING, "Cannot open config file [%s]", cfgfile);
return(FALSE);
}
@@ -1016,9 +1016,13 @@
if (cfgfile && !parse_config(cfgfile)) {
- cl_log(LOG_ERR, "Config file [%s] is incorrect."
- , cfgfile);
- exit(LSB_EXIT_NOTCONFIGED);
+ FILE* f;
+ if ((f = fopen(cfgfile, "r")) != NULL){
+ fclose(f);
+ cl_log(LOG_ERR, "Config file [%s] is incorrect."
+ , cfgfile);
+ exit(LSB_EXIT_NOTCONFIGED);
+ }
}
if (strlen(logd_config.debugfile) > 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cluster-glue/logd/logd.service.in
new/cluster-glue/logd/logd.service.in
--- old/cluster-glue/logd/logd.service.in 1970-01-01 01:00:00.000000000
+0100
+++ new/cluster-glue/logd/logd.service.in 2014-05-02 17:18:58.000000000
+0200
@@ -0,0 +1,13 @@
+[Unit]
+Description=ha_logd logging daemon
+Before=pacemaker.service
+PartOf=pacemaker.service
+
+[Service]
+ExecStart=@libdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf
+ExecStartPre=/bin/rm -f @HA_VARRUNDIR@/logd.pid
+ExecStopPost=/bin/rm -f @HA_VARRUNDIR@/logd.pid
+PIDFile=@HA_VARRUNDIR@/logd.pid
+
+[Install]
+WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
