Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2018-10-08 17:49:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Mon Oct 8 17:49:40 2018 rev:151 rq:640627 version:4.0.0+git.1539006450.f80a6308
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2018-10-04
19:01:02.559231794 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2018-10-08
17:51:00.274057139 +0200
@@ -1,0 +2,7 @@
+Mon Oct 08 13:47:39 UTC 2018 - kgronl...@suse.com
+
+- Update to version 4.0.0+git.1539006450.f80a6308:
+ * medium: bootstrap: Skip netmask check on GCP (bsc#1106946)
+ * medium: utils: Detect local IP on GCP (bsc#1106946)
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.0.0+git.1538492109.4b1170b0.tar.bz2
New:
----
crmsh-4.0.0+git.1539006450.f80a6308.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.QcBYH7/_old 2018-10-08 17:51:00.666056639 +0200
+++ /var/tmp/diff_new_pack.QcBYH7/_new 2018-10-08 17:51:00.670056634 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.0.0+git.1538492109.4b1170b0
+Version: 4.0.0+git.1539006450.f80a6308
Release: 0
Url: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.QcBYH7/_old 2018-10-08 17:51:00.722056567 +0200
+++ /var/tmp/diff_new_pack.QcBYH7/_new 2018-10-08 17:51:00.722056567 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">16b0d4178d68d1f61377f4db12a53617d21f6e84</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">d0111f9f688b9d5eeb7ad505efb1abd3d0cf6ebc</param></service></servicedata>
\ No newline at end of file
++++++ crmsh-4.0.0+git.1538492109.4b1170b0.tar.bz2 ->
crmsh-4.0.0+git.1539006450.f80a6308.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/bootstrap.py
new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/bootstrap.py
--- old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/bootstrap.py 2018-10-02
16:55:09.000000000 +0200
+++ new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/bootstrap.py 2018-10-08
15:47:30.000000000 +0200
@@ -1725,17 +1725,19 @@
if not ringXaddr:
error("No value for ring{}".format(i))
- _, outp = utils.get_stdout("ip addr show")
- tmp = re.findall(r' {}/[0-9]+ '.format(ringXaddr), outp,
re.M)[0].strip()
- peer_ip =
corosync.get_value("nodelist.node.ring{}_addr".format(i))
- # peer ring0_addr and local ring0_addr must be configured in
the same network
- if not utils.ip_in_network(peer_ip, tmp):
- errmsg = " Peer IP {} is not in the same network:
{}".format(peer_ip, tmp)
- if _context.yes_to_all:
- error(errmsg)
- else:
- print(term.render(clidisplay.error(errmsg)))
- continue
+ # this check does not work on GCP (bsc#1106946)
+ if utils.detect_cloud() != "google-cloud-platform":
+ _, outp = utils.get_stdout("ip addr show")
+ tmp = re.findall(r' {}/[0-9]+ '.format(ringXaddr), outp,
re.M)[0].strip()
+ peer_ip =
corosync.get_value("nodelist.node.ring{}_addr".format(i))
+ # peer ring0_addr and local ring0_addr must be configured
in the same network
+ if not utils.ip_in_network(peer_ip, tmp):
+ errmsg = " Peer IP {} is not in the same network:
{}".format(peer_ip, tmp)
+ if _context.yes_to_all:
+ error(errmsg)
+ else:
+ print(term.render(clidisplay.error(errmsg)))
+ continue
ringXaddr_res.append(ringXaddr)
break
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/utils.py
new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/utils.py
--- old/crmsh-4.0.0+git.1538492109.4b1170b0/crmsh/utils.py 2018-10-02
16:55:09.000000000 +0200
+++ new/crmsh-4.0.0+git.1539006450.f80a6308/crmsh/utils.py 2018-10-08
15:47:30.000000000 +0200
@@ -120,6 +120,10 @@
info[1], info[2], info[3] = src, sp[0], 32
if info[0] is None:
raise ValueError("Failed to determine default network interface")
+ if info[1] is None:
+ ips = ip_in_local()
+ if len(ips) > 0:
+ info[1] = ips[0]
return tuple(info)
