Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2015-09-09 20:21:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-08-29 20:05:10.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2015-09-09 20:21:24.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Sep 04 09:32:37 UTC 2015 - [email protected]
+
+- Update to version 0.4+git.1441350120.8e9abbe:
+ + Sync entire /etc/booth directory (fate#319318)
+ + Check corosync.conf before access (bsc#943227)
+ + Use update over replace to avoid deleting DC attributes (bsc#890802)
+ + Update README with a bit more detail
+
+- Remove 0001-sync-entire-booth-directory-fate-319318.patch
+
+-------------------------------------------------------------------
Old:
----
0001-sync-entire-booth-directory-fate-319318.patch
sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2
New:
----
sleha-bootstrap-0.4+git.1441350120.8e9abbe.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.P86RFd/_old 2015-09-09 20:21:24.000000000 +0200
+++ /var/tmp/diff_new_pack.P86RFd/_new 2015-09-09 20:21:24.000000000 +0200
@@ -18,7 +18,7 @@
Name: ha-cluster-bootstrap
-Version: 0.4+git.1440306826.cf7cfcf
+Version: 0.4+git.1441350120.8e9abbe
Release: 0
Summary: Pacemaker HA Cluster Bootstrap Tool
License: GPL-2.0
@@ -26,9 +26,6 @@
Url: https://github.com/tserong/sleha-bootstrap
Source: sleha-bootstrap-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM: Sync entire /etc/booth directory (fate#319318)
-Patch1: 0001-sync-entire-booth-directory-fate-319318.patch
-
Requires: csync2
Requires: ha-cluster-webui
Requires: iproute2
@@ -47,7 +44,6 @@
%prep
%setup -n sleha-bootstrap-%{version}
-%patch1 -p1
%build
%install
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.P86RFd/_old 2015-09-09 20:21:24.000000000 +0200
+++ /var/tmp/diff_new_pack.P86RFd/_new 2015-09-09 20:21:24.000000000 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/tserong/sleha-bootstrap.git</param>
- <param
name="changesrevision">cf7cfcf11507bf64493a83ab6c25e1843d7a3717</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">8e9abbe8c603cda068aadbb949ebde7996e512c4</param></service></servicedata>
\ No newline at end of file
++++++ sleha-bootstrap-0.4+git.1440306826.cf7cfcf.tar.bz2 ->
sleha-bootstrap-0.4+git.1441350120.8e9abbe.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/README
new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/README
--- old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/README 2015-08-28
12:25:54.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/README 2015-09-04
11:32:37.000000000 +0200
@@ -1,3 +1,17 @@
HA Cluster Bootstrap
+====================
-Tool to bootstrap a Pacemaker High Availability cluster in a hurry.
+Tools to bootstrap a Pacemaker High Availability cluster in a hurry.
+
+* ha-cluster-init
+ Installs and configures the first node in a new cluster.
+
+* ha-cluster-join
+ Installs and configures new nodes to join the cluster.
+
+* ha-cluster-remove
+ Removes a node from the cluster.
+
+NOTE: This tool is most likely to work best on a SUSE-based
+distribution (SLE or openSUSE). Patches to make it cross-
+platform compatible are welcomed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-init
new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-init
--- old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-init
2015-08-28 12:25:54.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-init
2015-09-04 11:32:37.000000000 +0200
@@ -137,7 +137,7 @@
{
key /etc/csync2/key_hagroup;
host $(hostname);
- include /etc/booth/booth.conf;
+ include /etc/booth;
include /etc/corosync/corosync.conf;
include /etc/corosync/authkey;
include /etc/csync2/csync2.cfg;
@@ -522,7 +522,7 @@
resource-stickiness="1" \\
migration-threshold="3"
END
- crm_configure_load replace $tmp_conf
+ crm_configure_load update $tmp_conf
# sbd fencing if applicable (getting local sbd_device here direct
# from SBD config, in case init_cluster is invoked on its own)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-join
new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-join
--- old/sleha-bootstrap-0.4+git.1440306826.cf7cfcf/scripts/ha-cluster-join
2015-08-28 12:25:54.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1441350120.8e9abbe/scripts/ha-cluster-join
2015-09-04 11:32:37.000000000 +0200
@@ -199,6 +199,10 @@
# Bump expected_votes in corosync.conf
# TODO(must): this is rather fragile (see related code in
ha-cluster-remove)
+
+ # If COROSYNC_CONF doesn't exist or is empty, we will fail here.
(bsc#943227)
+ [ ! -s $COROSYNC_CONF ] && error "$COROSYNC_CONF is not readable.
Please ensure that hostnames are resolvable."
+
local tmp_conf=${COROSYNC_CONF}.$$
local new_quorum=$(awk -F[^0-9] '/^[[:space:]]*expected_votes/ { print
$NF + 1 };' $COROSYNC_CONF)
local two_node=0
