Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2022-06-01 17:34:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "crmsh"
Wed Jun 1 17:34:53 2022 rev:245 rq:980205 version:4.4.0+20220601.b8c2952f
Changes:
--------
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-05-05
23:07:21.137629120 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1548/crmsh.changes 2022-06-01
17:35:15.202782726 +0200
@@ -1,0 +2,14 @@
+Wed Jun 01 02:36:16 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220601.b8c2952f:
+ * Dev: ui_cluster: Update help for deprecated --no-overwrite-sshkey option
+
+-------------------------------------------------------------------
+Wed Jun 01 01:25:58 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220601.da41ffc3:
+ * Fix: utils: wait4dc: Make change since output of 'crmadmin -S'
changed(bsc#1199412)
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: bootstrap: stop and disable csync2.socket on removed node
(bsc#1199325)
+
+-------------------------------------------------------------------
Old:
----
crmsh-4.4.0+20220505.a3a00365.tar.bz2
New:
----
crmsh-4.4.0+20220601.b8c2952f.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ crmsh.spec ++++++
--- /var/tmp/diff_new_pack.FYkr1Y/_old 2022-06-01 17:35:15.698783312 +0200
+++ /var/tmp/diff_new_pack.FYkr1Y/_new 2022-06-01 17:35:15.702783316 +0200
@@ -36,7 +36,7 @@
Summary: High Availability cluster command-line interface
License: GPL-2.0-or-later
Group: %{pkg_group}
-Version: 4.4.0+20220505.a3a00365
+Version: 4.4.0+20220601.b8c2952f
Release: 0
URL: http://crmsh.github.io
Source0: %{name}-%{version}.tar.bz2
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FYkr1Y/_old 2022-06-01 17:35:15.742783364 +0200
+++ /var/tmp/diff_new_pack.FYkr1Y/_new 2022-06-01 17:35:15.742783364 +0200
@@ -9,7 +9,7 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/crmsh.git</param>
- <param
name="changesrevision">a3a0036532f5b37b6cc6b659f89ac9dcb08f2896</param>
+ <param
name="changesrevision">b8c2952f150185a722fcbbe3f69a9c917d0ed5f1</param>
</service>
</servicedata>
(No newline at EOF)
++++++ crmsh-4.4.0+20220505.a3a00365.tar.bz2 ->
crmsh-4.4.0+20220601.b8c2952f.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220505.a3a00365/crmsh/bootstrap.py
new/crmsh-4.4.0+20220601.b8c2952f/crmsh/bootstrap.py
--- old/crmsh-4.4.0+20220505.a3a00365/crmsh/bootstrap.py 2022-05-05
03:52:21.000000000 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/crmsh/bootstrap.py 2022-06-01
04:19:41.000000000 +0200
@@ -54,7 +54,7 @@
SYSCONFIG_FW_CLUSTER = "/etc/sysconfig/SuSEfirewall2.d/services/cluster"
PCMK_REMOTE_AUTH = "/etc/pacemaker/authkey"
COROSYNC_CONF_ORIG = tmpfiles.create()[1]
-SERVICES_STOP_LIST = ["corosync-qdevice.service", "corosync.service",
"hawk.service"]
+SERVICES_STOP_LIST = ["corosync-qdevice.service", "corosync.service",
"hawk.service", "csync2.socket"]
USER_LIST = ["root", "hacluster"]
WATCHDOG_CFG = "/etc/modules-load.d/watchdog.conf"
BOOTH_DIR = "/etc/booth"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220505.a3a00365/crmsh/ui_cluster.py
new/crmsh-4.4.0+20220601.b8c2952f/crmsh/ui_cluster.py
--- old/crmsh-4.4.0+20220505.a3a00365/crmsh/ui_cluster.py 2022-05-05
03:52:21.000000000 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/crmsh/ui_cluster.py 2022-06-01
04:19:41.000000000 +0200
@@ -298,7 +298,7 @@
parser.add_argument("-q", "--quiet", action="store_true", dest="quiet",
help="Be quiet (don't describe what's happening,
just do it)")
parser.add_argument("-y", "--yes", action="store_true",
dest="yes_to_all",
- help='Answer "yes" to all prompts (use with
caution, this is destructive, especially those storage related configurations
and stages. The /root/.ssh/id_rsa key will be overwritten unless the option
"--no-overwrite-sshkey" is used)')
+ help='Answer "yes" to all prompts (use with
caution, this is destructive, especially those storage related configurations
and stages.)')
parser.add_argument("-n", "--name", metavar="NAME",
dest="cluster_name", default="hacluster",
help='Set the name of the configured cluster.')
parser.add_argument("-N", "--nodes", metavar="NODES", dest="nodes",
@@ -309,7 +309,7 @@
parser.add_argument("-w", "--watchdog", dest="watchdog",
metavar="WATCHDOG",
help="Use the given watchdog device or driver
name")
parser.add_argument("--no-overwrite-sshkey", action="store_true",
dest="no_overwrite_sshkey",
- help='Avoid "/root/.ssh/id_rsa" overwrite if "-y"
option is used (False by default)')
+ help='Avoid "/root/.ssh/id_rsa" overwrite if "-y"
option is used (False by default; Deprecated)')
network_group = parser.add_argument_group("Network configuration",
"Options for configuring the network and messaging layer.")
network_group.add_argument("-i", "--interface", dest="nic_list",
metavar="IF", action="append", choices=utils.interface_choice(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220505.a3a00365/crmsh/utils.py
new/crmsh-4.4.0+20220601.b8c2952f/crmsh/utils.py
--- old/crmsh-4.4.0+20220505.a3a00365/crmsh/utils.py 2022-05-05
03:52:21.000000000 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/crmsh/utils.py 2022-06-01
04:19:41.000000000 +0200
@@ -895,15 +895,10 @@
return False
cmd = "crmadmin -S %s" % dc
rc, s = get_stdout(add_sudo(cmd))
- if not s.startswith("Status"):
- logger.warning("%s unexpected output: %s (exit code: %d)", cmd, s,
rc)
+ if rc != 0:
+ logger.error("Exit code of command {} is {}".format(cmd, rc))
return False
- try:
- dc_status = s.split()[-2]
- except:
- logger.warning("%s unexpected output: %s", cmd, s)
- return False
- if dc_status == "S_IDLE":
+ if re.search("S_IDLE.*ok", s):
if output_started:
sys.stderr.write(" done\n")
return True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220505.a3a00365/test/features/steps/const.py
new/crmsh-4.4.0+20220601.b8c2952f/test/features/steps/const.py
--- old/crmsh-4.4.0+20220505.a3a00365/test/features/steps/const.py
2022-05-05 03:52:21.000000000 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/test/features/steps/const.py
2022-06-01 04:19:41.000000000 +0200
@@ -65,9 +65,7 @@
-q, --quiet Be quiet (don't describe what's happening, just do it)
-y, --yes Answer "yes" to all prompts (use with caution, this is
destructive, especially those storage related
- configurations and stages. The /root/.ssh/id_rsa key
- will be overwritten unless the option "--no-overwrite-
- sshkey" is used)
+ configurations and stages.)
-n NAME, --name NAME Set the name of the configured cluster.
-N NODES, --nodes NODES
Additional nodes to add to the created cluster. May
@@ -79,7 +77,7 @@
Use the given watchdog device or driver name
--no-overwrite-sshkey
Avoid "/root/.ssh/id_rsa" overwrite if "-y" option is
- used (False by default)
+ used (False by default; Deprecated)
Network configuration:
Options for configuring the network and messaging layer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220505.a3a00365/test/unittests/test_bootstrap.py
new/crmsh-4.4.0+20220601.b8c2952f/test/unittests/test_bootstrap.py
--- old/crmsh-4.4.0+20220505.a3a00365/test/unittests/test_bootstrap.py
2022-05-05 03:52:21.000000000 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/test/unittests/test_bootstrap.py
2022-06-01 04:19:41.000000000 +0200
@@ -1330,22 +1330,25 @@
@mock.patch('logging.Logger.info')
@mock.patch('crmsh.utils.service_is_active')
def test_stop_services(self, mock_active, mock_status, mock_stop):
- mock_active.side_effect = [True, True, True]
+ mock_active.side_effect = [True, True, True, True]
bootstrap.stop_services(bootstrap.SERVICES_STOP_LIST)
mock_active.assert_has_calls([
mock.call("corosync-qdevice.service", remote_addr=None),
mock.call("corosync.service", remote_addr=None),
- mock.call("hawk.service", remote_addr=None)
+ mock.call("hawk.service", remote_addr=None),
+ mock.call("csync2.socket", remote_addr=None)
])
mock_status.assert_has_calls([
mock.call("Stopping the corosync-qdevice.service"),
mock.call("Stopping the corosync.service"),
- mock.call("Stopping the hawk.service")
+ mock.call("Stopping the hawk.service"),
+ mock.call("Stopping the csync2.socket")
])
mock_stop.assert_has_calls([
mock.call("corosync-qdevice.service", disable=True,
remote_addr=None),
mock.call("corosync.service", disable=True, remote_addr=None),
- mock.call("hawk.service", disable=True, remote_addr=None)
+ mock.call("hawk.service", disable=True, remote_addr=None),
+ mock.call("csync2.socket", disable=True, remote_addr=None)
])
@mock.patch('crmsh.utils.fatal')
