Hello community,
here is the log from the commit of package ha-cluster-bootstrap for
openSUSE:Factory checked in at 2015-05-18 22:21:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-06 07:48:39.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.ha-cluster-bootstrap.new/ha-cluster-bootstrap.changes
2015-05-18 22:21:21.000000000 +0200
@@ -1,0 +2,9 @@
+Fri May 08 16:29:54 UTC 2015 - [email protected]
+
+- Update to version 0.4+git.1430918556.6f42311:
+ + Patches merged upstream
+ + Exit with error if ha-cluster-join is called over ssh without -t
(bnc#892702)
+- Remove 0001-Improved-IP-address-detection-algorithm-boo-920226.patch
+- Remove 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Improved-IP-address-detection-algorithm-boo-920226.patch
0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch
sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2
New:
----
_servicedata
sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ha-cluster-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.uzfh50/_old 2015-05-18 22:21:22.000000000 +0200
+++ /var/tmp/diff_new_pack.uzfh50/_new 2015-05-18 22:21:22.000000000 +0200
@@ -18,7 +18,7 @@
Name: ha-cluster-bootstrap
-Version: 0.4+git.1410854324.8459115
+Version: 0.4+git.1430918556.6f42311
Release: 0
Summary: Pacemaker HA Cluster Bootstrap Tool
License: GPL-2.0
@@ -26,12 +26,6 @@
Url: https://github.com/tserong/sleha-bootstrap
Source: sleha-bootstrap-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM: Improved IP address detection algorithm (boo#920226)
-Patch1: 0001-Improved-IP-address-detection-algorithm-boo-920226.patch
-# PATCH-FIX-UPSTREAM: Use crm_node to count nodes in cluster when deciding
-# to reset no-quorum-policy=ignore (boo#923372)
-Patch2: 0002-Use-crm_node-to-count-nodes-in-cluster-when-deciding.patch
-
Requires: csync2
Requires: hawk
Requires: iproute2
@@ -49,8 +43,6 @@
%prep
%setup -n sleha-bootstrap-%{version}
-%patch1 -p1
-%patch2 -p1
%build
%install
++++++ _service ++++++
--- /var/tmp/diff_new_pack.uzfh50/_old 2015-05-18 22:21:22.000000000 +0200
+++ /var/tmp/diff_new_pack.uzfh50/_new 2015-05-18 22:21:22.000000000 +0200
@@ -4,7 +4,8 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">0.4+git.%ct.%h</param>
- <param name="revision">8459115</param>
+ <param name="revision">master</param>
+ <param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/tserong/sleha-bootstrap.git</param>
<param
name="changesrevision">6f423117528b0c730b17cbeec909caa7ed719f4a</param></service></servicedata>++++++
sleha-bootstrap-0.4+git.1410854324.8459115.tar.bz2 ->
sleha-bootstrap-0.4+git.1430918556.6f42311.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions
new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-functions
--- old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-functions
2014-09-16 10:16:03.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-functions
2015-05-08 18:29:54.000000000 +0200
@@ -470,6 +470,14 @@
init_firewall
}
+check_tty()
+{
+ # Check for pseudo-tty: Cannot display read prompts without a TTY
(bnc#892702)
+ if ! tty -s; then
+ error "No pseudo-tty detected! Use -t option to ssh if calling
remotely."
+ fi
+}
+
init()
{
log_start
@@ -495,9 +503,7 @@
# up. If $IP_ADDRESS is overridden, network detect shouldn't work,
# because "ip route" won't be able to help us.
if [ -z "$IP_ADDRESS" ]; then
- IP_ADDRESS=$(ip -o -f inet addr show primary | \
- awk "/[[:space:]]${NET_IF}[[:space:]]/ {print \$4} " |
- sed 's/\/[0-9]\+//')
+ IP_ADDRESS=$(ip route get 1 oif $NET_IF | head -1 | awk '{print
$NF}')
fi
if [ -z "$IP_NETWORK" -a -n "$IP_ADDRESS" ]; then
IP_NETWORK=$(ip route list | \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-init
new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-init
--- old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-init
2014-09-16 10:16:03.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-init
2015-05-08 18:29:54.000000000 +0200
@@ -627,6 +627,7 @@
# Need hostname resolution to work, want NTP (but don't block ssh_remote or
csync2_remote)
if [ "$stage" != "ssh_remote" -a "$stage" != "csync2_remote" ]; then
+ check_tty
check_prereqs
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-join
new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-join
--- old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-join
2014-09-16 10:16:03.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-join
2015-05-08 18:29:54.000000000 +0200
@@ -219,7 +219,7 @@
invoke corosync-cfgtool -R
# Ditch no-quorum-policy=ignore if we're going over two nodes
- if [ $new_quorum -gt 2 ] && crm configure show | grep -q
'no-quorum-policy=.*ignore' ; then
+ if [ $(crm_node -l | sed '/^$/d' | wc -l) -gt 2 ] && crm configure show
| grep -q 'no-quorum-policy=.*ignore' ; then
invoke crm_attribute --attr-name no-quorum-policy --delete-attr
fi
}
@@ -258,6 +258,7 @@
[ $rc -eq 0 ] && error "Cluster is currently active - can't run"
fi
+check_tty
# Need hostname resolution to work, want NTP
check_prereqs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-remove
new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-remove
--- old/sleha-bootstrap-0.4+git.1410854324.8459115/scripts/ha-cluster-remove
2014-09-16 10:16:03.000000000 +0200
+++ new/sleha-bootstrap-0.4+git.1430918556.6f42311/scripts/ha-cluster-remove
2015-05-08 18:29:54.000000000 +0200
@@ -228,6 +228,7 @@
[ -n "$SEED_HOST" ] || _die "No existing IP/hostname specified (use -c option)"
+check_tty
init
remove_ssh
remove_hostname_check
