commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-05-21 18:35:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1880 (New)
Package is "crmsh"
Tue May 21 18:35:11 2024 rev:334 rq:1175314 version:4.6.0+20240520.13b2906a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-05-09
12:15:02.073478415 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1880/crmsh.changes2024-05-21
18:35:33.912460269 +0200
@@ -1,0 +2,6 @@
+Mon May 20 08:18:47 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240520.13b2906a:
+ * Fix: healthcheck: KeyError when local nodename not found in cib
(bsc#1223438)
+
+---
Old:
crmsh-4.6.0+20240509.37a1c4e3.tar.bz2
New:
crmsh-4.6.0+20240520.13b2906a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.s3KYHI/_old 2024-05-21 18:35:35.472516978 +0200
+++ /var/tmp/diff_new_pack.s3KYHI/_new 2024-05-21 18:35:35.476517124 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240509.37a1c4e3
+Version:4.6.0+20240520.13b2906a
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.s3KYHI/_old 2024-05-21 18:35:35.804529047 +0200
+++ /var/tmp/diff_new_pack.s3KYHI/_new 2024-05-21 18:35:35.852530792 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 2ddd571f8715bc63698fe05775cfceb15d755eda
+ 13b2906a72d7a0bfe7a9f7b2df64b1ec630e1050
(No newline at EOF)
++ crmsh-4.6.0+20240509.37a1c4e3.tar.bz2 ->
crmsh-4.6.0+20240520.13b2906a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240509.37a1c4e3/crmsh/healthcheck.py
new/crmsh-4.6.0+20240520.13b2906a/crmsh/healthcheck.py
--- old/crmsh-4.6.0+20240509.37a1c4e3/crmsh/healthcheck.py 2024-05-09
08:43:44.0 +0200
+++ new/crmsh-4.6.0+20240520.13b2906a/crmsh/healthcheck.py 2024-05-20
09:38:54.0 +0200
@@ -146,7 +146,13 @@
logger.debug("setup passwordless ssh authentication for user
hacluster")
local_node = crmsh.utils.this_node()
remote_nodes = set(nodes)
-remote_nodes.remove(local_node)
+try:
+remote_nodes.remove(local_node)
+except KeyError:
+# bsc#1223438: local nodename not in cib
+# init_ssh_impl should work even if the local node is included in
user_node_list
+# although this is not a designed usage
+logger.warning("local node %s is not found in cluster node list
%s", local_node, remote_nodes)
remote_nodes = list(remote_nodes)
crmsh.parallax.parallax_run(
nodes,
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-05-09 12:14:48
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1880 (New)
Package is "crmsh"
Thu May 9 12:14:48 2024 rev:333 rq:1172882 version:4.6.0+20240509.37a1c4e3
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-04-30
17:29:30.894873257 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1880/crmsh.changes2024-05-09
12:15:02.073478415 +0200
@@ -1,0 +2,14 @@
+Thu May 09 07:48:15 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240509.37a1c4e3:
+ * Dev: unittest: Adjust unit test for previous commit
+ * Dev: utils: Add info when property is newly added
+
+---
+Tue Apr 30 01:30:45 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240430.5d7136c8:
+ * Dev: doc/website-v1: update man-4.6 (#1409)
+ * Fix: doc/toolchain: fix missing anchor in generated AIO doc (#1409)
+
+---
Old:
crmsh-4.6.0+20240430.641cb15b.tar.bz2
New:
crmsh-4.6.0+20240509.37a1c4e3.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.786V9k/_old 2024-05-09 12:15:02.813505277 +0200
+++ /var/tmp/diff_new_pack.786V9k/_new 2024-05-09 12:15:02.817505422 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240430.641cb15b
+Version:4.6.0+20240509.37a1c4e3
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.786V9k/_old 2024-05-09 12:15:02.861507019 +0200
+++ /var/tmp/diff_new_pack.786V9k/_new 2024-05-09 12:15:02.865507164 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 641cb15b7e93ed74412c833fb6767d2c3530d3b1
+ 2ddd571f8715bc63698fe05775cfceb15d755eda
(No newline at EOF)
++ crmsh-4.6.0+20240430.641cb15b.tar.bz2 ->
crmsh-4.6.0+20240509.37a1c4e3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240430.641cb15b/crmsh/utils.py
new/crmsh-4.6.0+20240509.37a1c4e3/crmsh/utils.py
--- old/crmsh-4.6.0+20240430.641cb15b/crmsh/utils.py2024-04-30
01:35:26.0 +0200
+++ new/crmsh-4.6.0+20240509.37a1c4e3/crmsh/utils.py2024-05-09
08:43:44.0 +0200
@@ -2859,11 +2859,12 @@
origin_value = get_property(property_name, property_type)
if origin_value and str(origin_value) == str(property_value):
return
-if conditional:
-if crm_msec(origin_value) >= crm_msec(property_value):
-return
+if conditional and crm_msec(origin_value) >= crm_msec(property_value):
+return
+if not origin_value and property_value:
+logger.info("Set property \"%s\" in %s to %s", property_name,
property_type, property_value)
if origin_value and str(origin_value) != str(property_value):
-logger.warning("\"{}\" in {} is set to {}, it was
{}".format(property_name, property_type, property_value, origin_value))
+logger.warning("\"%s\" in %s is set to %s, it was %s", property_name,
property_type, property_value, origin_value)
property_sub_cmd = "property" if property_type == "crm_config" else
property_type
cmd = "crm configure {} {}={}".format(property_sub_cmd, property_name,
property_value)
sh.cluster_shell().get_stdout_or_raise_error(cmd)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20240430.641cb15b/doc/toolchain/bin/adocxt
new/crmsh-4.6.0+20240509.37a1c4e3/doc/toolchain/bin/adocxt
--- old/crmsh-4.6.0+20240430.641cb15b/doc/toolchain/bin/adocxt 2024-04-30
01:35:26.0 +0200
+++ new/crmsh-4.6.0+20240509.37a1c4e3/doc/toolchain/bin/adocxt 2024-05-09
08:43:44.0 +0200
@@ -10,7 +10,7 @@
RE_FROM_CODE = re.compile(r'^\[\[([^,]+),[^,]*,From Code]]$')
RE_TAG = re.compile('^cmdhelp_(.*)$')
RE_SECTION_TITLE = re.compile('^=')
-RE_FROM_CODE_OR_SECTION_TITLE=re.compile(r'^(?:\[\[([^,]+),[^,]*,From
Code]]$|=)')
+RE_ANCHOR_OR_SECTION_TITLE=re.compile(r'^(?:\[\[.*]]$|=)')
TAG_EXCLUDES = {
'cmdhelp_root_report',
@@ -86,7 +86,7 @@
break
case _:
# waiting for next section
-found = RE_FROM_CODE_OR_SECTION_TITLE.match(line)
+found = RE_ANCHOR_OR_SECTION_TITLE.match(line)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-04-30 17:27:52
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1880 (New)
Package is "crmsh"
Tue Apr 30 17:27:52 2024 rev:332 rq:1170896 version:4.6.0+20240430.641cb15b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-04-25
20:48:35.616783113 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1880/crmsh.changes2024-04-30
17:29:30.894873257 +0200
@@ -1,0 +2,14 @@
+Mon Apr 29 23:59:04 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240430.641cb15b:
+ * Fix: main: Set PATH environment first
+ * Dev: bash_completion: Enable complete 'id=' on non-interactive mode
+
+---
+Thu Apr 25 08:32:10 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240425.c75d131a:
+ * Doc: regenerate man-4.6
+ * Dev: ui_context: ignore requirements when option --help is specified
+
+---
Old:
crmsh-4.6.0+20240424.11e262d0.tar.bz2
New:
crmsh-4.6.0+20240430.641cb15b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.uxp2aA/_old 2024-04-30 17:29:31.762904823 +0200
+++ /var/tmp/diff_new_pack.uxp2aA/_new 2024-04-30 17:29:31.766904969 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240424.11e262d0
+Version:4.6.0+20240430.641cb15b
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.uxp2aA/_old 2024-04-30 17:29:31.822907005 +0200
+++ /var/tmp/diff_new_pack.uxp2aA/_new 2024-04-30 17:29:31.826907151 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 11e262d05440b23219eb9365e81d65488e83e080
+ 641cb15b7e93ed74412c833fb6767d2c3530d3b1
(No newline at EOF)
++ crmsh-4.6.0+20240424.11e262d0.tar.bz2 ->
crmsh-4.6.0+20240430.641cb15b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20240424.11e262d0/contrib/bash_completion.sh
new/crmsh-4.6.0+20240430.641cb15b/contrib/bash_completion.sh
--- old/crmsh-4.6.0+20240424.11e262d0/contrib/bash_completion.sh
2024-04-24 11:30:11.0 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/contrib/bash_completion.sh
2024-04-30 01:35:26.0 +0200
@@ -149,7 +149,7 @@
for x in $1; do
if [[ "$x" == "$3"* ]]; then
if [[ "$x" =~ .*(=|:)$ ]];then
-if [[ "$x" =~ ^id=$ ]];then
+if [[ "$x" =~ ^id=$ ]] && [ "$x" == "$3" ];then
:
else
COMPREPLY[i++]="$2$x"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/crmsh/constants.py
new/crmsh-4.6.0+20240430.641cb15b/crmsh/constants.py
--- old/crmsh-4.6.0+20240424.11e262d0/crmsh/constants.py2024-04-24
11:30:11.0 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/crmsh/constants.py2024-04-30
01:35:26.0 +0200
@@ -512,5 +512,6 @@
RSC_ROLE_UNPROMOTED_LEGACY = "Slave"
PCMK_VERSION_DEFAULT = "2.0.0"
-NON_FUNCTIONAL_COMMANDS = ('help', 'cd', 'ls', 'quit', 'up')
+NON_FUNCTIONAL_COMMANDS = {'help', 'cd', 'ls', 'quit', 'up'}
+NON_FUNCTIONAL_OPTIONS = {'--help', '--help-without-redirect'}
# vim:ts=4:sw=4:et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/crmsh/main.py
new/crmsh-4.6.0+20240430.641cb15b/crmsh/main.py
--- old/crmsh-4.6.0+20240424.11e262d0/crmsh/main.py 2024-04-24
11:30:11.0 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/crmsh/main.py 2024-04-30
01:35:26.0 +0200
@@ -345,10 +345,10 @@
def run():
try:
+envsetup()
if len(sys.argv) >= 2 and sys.argv[1] == '--compgen':
compgen()
return 0
-envsetup()
userdir.mv_user_files()
ui = ui_root.Root()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240424.11e262d0/crmsh/ui_context.py
new/crmsh-4.6.0+20240430.641cb15b/crmsh/ui_context.py
--- old/crmsh-4.6.0+20240424.11e262d0/crmsh/ui_context.py 2024-04-24
11:30:11.0 +0200
+++ new/crmsh-4.6.0+20240430.641cb15b/crmsh/ui_context.py 2024-04-30
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-04-25 20:48:33
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1880 (New)
Package is "crmsh"
Thu Apr 25 20:48:33 2024 rev:331 rq:1170010 version:4.6.0+20240424.11e262d0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-04-11
19:41:41.054939497 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1880/crmsh.changes2024-04-25
20:48:35.616783113 +0200
@@ -1,0 +2,27 @@
+Wed Apr 24 09:43:44 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240424.11e262d0:
+ * Dev: behave: Add functional test for previous change
+ * Dev: ui_context: Skip querying CIB when in a sublevel or help command
+ * Dev: unittest: Adjust unit test for previous commit
+ * Dev: behave: Adjust functional test for previous changes
+ * Dev: bootstrap: Setup the stage dependency on init and join side
(bsc#1175865, bsc#1219940)
+ * Dev: ui_cluster: Remove unused codes
+ * Dev: bootstrap: Enhance stage validation
+ * Dev: bootstrap: Remove unused function join_remote_auth
+
+---
+Mon Apr 22 07:38:44 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240422.73eaf02a:
+ * Fix: healthcheck: Add crmsh.constants.SSH_OPTION when doing ssh in
check_local
+ * Fix: healthcheck: Missing 'id_' prefix while checking the ssh key existence
+
+---
+Tue Apr 16 07:54:40 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240416.3c953893:
+ * Dev: unittest: Adjust unit test for previous commit
+ * Fix: bootstrap: Detect cluster service on init node before saving the
canonical hostname (bsc#1222714)
+
+---
Old:
crmsh-4.6.0+20240411.9c4bf6c1.tar.bz2
New:
crmsh-4.6.0+20240424.11e262d0.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.KxoAoj/_old 2024-04-25 20:48:36.488815133 +0200
+++ /var/tmp/diff_new_pack.KxoAoj/_new 2024-04-25 20:48:36.492815280 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240411.9c4bf6c1
+Version:4.6.0+20240424.11e262d0
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.KxoAoj/_old 2024-04-25 20:48:36.536816896 +0200
+++ /var/tmp/diff_new_pack.KxoAoj/_new 2024-04-25 20:48:36.540817042 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- a369f9ca76c9bc8b063843ba9d913fdab6db7bf6
+ 11e262d05440b23219eb9365e81d65488e83e080
(No newline at EOF)
++ crmsh-4.6.0+20240411.9c4bf6c1.tar.bz2 ->
crmsh-4.6.0+20240424.11e262d0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240411.9c4bf6c1/crmsh/bootstrap.py
new/crmsh-4.6.0+20240424.11e262d0/crmsh/bootstrap.py
--- old/crmsh-4.6.0+20240411.9c4bf6c1/crmsh/bootstrap.py2024-04-11
08:31:14.0 +0200
+++ new/crmsh-4.6.0+20240424.11e262d0/crmsh/bootstrap.py2024-04-24
11:30:11.0 +0200
@@ -47,6 +47,7 @@
from .sh import ShellUtils
from .ui_node import NodeMgmt
from .user_of_host import UserOfHost, UserNotFoundError
+import crmsh.healthcheck
logger = log.setup_logger(__name__)
logger_utils = log.LoggerUtils(logger)
@@ -74,7 +75,11 @@
"/etc/drbd.conf", "/etc/drbd.d", "/etc/ha.d/ldirectord.cf",
"/etc/lvm/lvm.conf", "/etc/multipath.conf",
"/etc/samba/smb.conf", SYSCONFIG_NFS, SYSCONFIG_PCMK, SYSCONFIG_SBD,
PCMK_REMOTE_AUTH, WATCHDOG_CFG,
PROFILES_FILE, CRM_CFG, SBD_SYSTEMD_DELAY_START_DIR)
-INIT_STAGES = ("ssh", "csync2", "csync2_remote", "qnetd_remote", "corosync",
"remote_auth", "sbd", "cluster", "ocfs2", "admin", "qdevice")
+
+INIT_STAGES_EXTERNAL = ("ssh", "csync2", "corosync", "sbd", "cluster",
"ocfs2", "admin", "qdevice")
+INIT_STAGES_INTERNAL = ("csync2_remote", "qnetd_remote", "remote_auth")
+INIT_STAGES_ALL = INIT_STAGES_EXTERNAL + INIT_STAGES_INTERNAL
+JOIN_STAGES_EXTERNAL = ("ssh", "csync2", "ssh_merge", "cluster")
class Context(object):
@@ -232,7 +237,7 @@
"""
Validate cluster_node on join side
"""
-if self.cluster_node and self.type == 'join':
+if self.type == "join" and self.cluster_node:
user, node = _parse_user_at_host(self.cluster_node, None)
try:
# self.cluster_node
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-04-03 17:20:34
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1905 (New)
Package is "crmsh"
Wed Apr 3 17:20:34 2024 rev:328 rq:1164253 version:4.6.0+20240403.3ed4d839
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-04-02
16:44:11.916979724 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1905/crmsh.changes2024-04-03
17:21:57.632914066 +0200
@@ -1,0 +2,20 @@
+Wed Apr 03 03:33:06 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240403.3ed4d839:
+ * Dev: unittest: Adjust unit test for previous commit
+ * Dev: behave: Adjust functional test for previous commit
+ * Fix: ui_node: When `utils.list_cluster_nodes` return None, try to get ip
list from corosync.conf
+
+---
+Mon Apr 01 08:00:47 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240401.d4bf74c8:
+ * Dev: unittest: Adjust unit test for previous commit
+ * Dev: bootstrap: Add all nodes' keys to qnetd authroized_keys even init
+ * Fix: bootstrap: fix NameError
+ * Dev: qdevice: Refactor init_qdevice function
+ * Dev: qdevice: Add all nodes' keys to qnetd authorized_keys
+ * Fix: ui_node: prevent traceback on node online
+ * Fix: ui_node: prevent traceback on node standby
+
+---
Old:
crmsh-4.6.0+20240330.3473a5ba.tar.bz2
New:
crmsh-4.6.0+20240403.3ed4d839.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.uf6azD/_old 2024-04-03 17:21:58.200935023 +0200
+++ /var/tmp/diff_new_pack.uf6azD/_new 2024-04-03 17:21:58.200935023 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240330.3473a5ba
+Version:4.6.0+20240403.3ed4d839
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.uf6azD/_old 2024-04-03 17:21:58.240936499 +0200
+++ /var/tmp/diff_new_pack.uf6azD/_new 2024-04-03 17:21:58.240936499 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 3473a5ba98249197c99ba63dd2a32b675493d6f9
+ df8a7f1c1e6365ec13cd5ec1e7d6bbc7a1bd503d
(No newline at EOF)
++ crmsh-4.6.0+20240330.3473a5ba.tar.bz2 ->
crmsh-4.6.0+20240403.3ed4d839.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240330.3473a5ba/crmsh/bootstrap.py
new/crmsh-4.6.0+20240403.3ed4d839/crmsh/bootstrap.py
--- old/crmsh-4.6.0+20240330.3473a5ba/crmsh/bootstrap.py2024-03-30
12:48:39.0 +0100
+++ new/crmsh-4.6.0+20240403.3ed4d839/crmsh/bootstrap.py2024-04-03
05:07:17.0 +0200
@@ -74,7 +74,7 @@
"/etc/drbd.conf", "/etc/drbd.d", "/etc/ha.d/ldirectord.cf",
"/etc/lvm/lvm.conf", "/etc/multipath.conf",
"/etc/samba/smb.conf", SYSCONFIG_NFS, SYSCONFIG_PCMK, SYSCONFIG_SBD,
PCMK_REMOTE_AUTH, WATCHDOG_CFG,
PROFILES_FILE, CRM_CFG, SBD_SYSTEMD_DELAY_START_DIR)
-INIT_STAGES = ("ssh", "csync2", "csync2_remote", "corosync", "remote_auth",
"sbd", "cluster", "ocfs2", "admin", "qdevice")
+INIT_STAGES = ("ssh", "csync2", "csync2_remote", "qnetd_remote", "corosync",
"remote_auth", "sbd", "cluster", "ocfs2", "admin", "qdevice")
class Context(object):
@@ -802,7 +802,7 @@
try:
keys = ssh_key.AgentClient().list()
logger.info("Using public keys from ssh-agent...")
-except Error:
+except ssh_key.Error:
logger.error("Cannot get a public key from ssh-agent.")
raise
return keys
@@ -1178,6 +1178,18 @@
_context.quiet = was_quiet
+def init_qnetd_remote():
+"""
+Triggered by join_cluster, this function adds the joining node's key to
the qnetd's authorized_keys
+"""
+local_user, remote_user, join_node =
_select_user_pair_for_ssh_for_secondary_components(_context.cluster_node)
+join_node_key_content = remote_public_key_from(remote_user, local_user,
join_node, remote_user)
+qnetd_host = corosync.get_value("quorum.device.net.host")
+_, qnetd_user, qnetd_host =
_select_user_pair_for_ssh_for_secondary_components(qnetd_host)
+authorized_key_manager = ssh_key.AuthorizedKeyManager(sh.cluster_shell())
+authorized_key_manager.add(qnetd_host, qnetd_user,
ssh_key.InMemoryPublicKey(join_node_key_content))
+
+
def init_corosync_auth():
"""
Generate the corosync authkey
@@
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-04-02 16:42:37
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1905 (New)
Package is "crmsh"
Tue Apr 2 16:42:37 2024 rev:327 rq:1163701 version:4.6.0+20240330.3473a5ba
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-03-13
22:22:26.700827362 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1905/crmsh.changes2024-04-02
16:44:11.916979724 +0200
@@ -1,0 +2,31 @@
+Sat Mar 30 12:13:23 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240330.3473a5ba:
+ * Dev: behave: Addd functional test for previous commit
+ * Dev: bootstrap: Give a warning when detecting $SSH_AUTH_SOCK but not use
--use-ssh-agent option
+
+---
+Wed Mar 27 08:04:12 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240327.74a899fc:
+ * Dev: ui_context: make help subcommands to exit with 0 (#1374)
+
+---
+Mon Mar 25 08:29:51 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240325.bb913aba:
+ * Dev: behave: Adjust functional test for previous commit
+ * Fix: sh: Return the value of AuthorizationError.diagnose if it is not None
+
+---
+Fri Mar 15 07:03:07 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240315.053594ab:
+ * Dev: unittest: Adjust unit test for previous commit
+ * Dev: bootstrap: Remove unused ssh_remote related code
+ * Dev: unittest: Adjust unit test for previous commit
+ * Dev: bootstrap: Remove unused function bootstrap.append_unique
+ * Dev: ssh_key: Extract duplicate code about list keys from ssh-agent to a
function
+ * Dev: bootstrap: Refactor qdevice user parsing and finding
+
+---
Old:
crmsh-4.6.0+20240313.8278d949.tar.bz2
New:
crmsh-4.6.0+20240330.3473a5ba.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.hChqCJ/_old 2024-04-02 16:44:13.057020418 +0200
+++ /var/tmp/diff_new_pack.hChqCJ/_new 2024-04-02 16:44:13.061020561 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240313.8278d949
+Version:4.6.0+20240330.3473a5ba
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.hChqCJ/_old 2024-04-02 16:44:13.101021989 +0200
+++ /var/tmp/diff_new_pack.hChqCJ/_new 2024-04-02 16:44:13.101021989 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 8278d9498f904df34feebd387225eecd2cca21f4
+ 3473a5ba98249197c99ba63dd2a32b675493d6f9
(No newline at EOF)
++ crmsh-4.6.0+20240313.8278d949.tar.bz2 ->
crmsh-4.6.0+20240330.3473a5ba.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20240313.8278d949/.github/workflows/crmsh-ci.yml
new/crmsh-4.6.0+20240330.3473a5ba/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.6.0+20240313.8278d949/.github/workflows/crmsh-ci.yml
2024-03-13 14:56:37.0 +0100
+++ new/crmsh-4.6.0+20240330.3473a5ba/.github/workflows/crmsh-ci.yml
2024-03-30 12:48:39.0 +0100
@@ -351,7 +351,7 @@
timeout-minutes: 40
steps:
- uses: actions/checkout@v3
-- name: functional test for user access
+- name: functional test for ssh agent
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240313.8278d949/crmsh/bootstrap.py
new/crmsh-4.6.0+20240330.3473a5ba/crmsh/bootstrap.py
--- old/crmsh-4.6.0+20240313.8278d949/crmsh/bootstrap.py2024-03-13
14:56:37.0 +0100
+++ new/crmsh-4.6.0+20240330.3473a5ba/crmsh/bootstrap.py2024-03-30
12:48:39.0 +0100
@@ -74,7 +74,7 @@
"/etc/drbd.conf", "/etc/drbd.d", "/etc/ha.d/ldirectord.cf",
"/etc/lvm/lvm.conf", "/etc/multipath.conf",
"/etc/samba/smb.conf", SYSCONFIG_NFS, SYSCONFIG_PCMK, SYSCONFIG_SBD,
PCMK_REMOTE_AUTH, WATCHDOG_CFG,
PROFILES_FILE, CRM_CFG, SBD_SYSTEMD_DELAY_START_DIR)
-INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"remote_auth", "sbd", "cluster", "ocfs2", "admin", "qdevice")
+INIT_STAGES = ("ssh",
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-03-13 22:21:08
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1770 (New)
Package is "crmsh"
Wed Mar 13 22:21:08 2024 rev:326 rq:1157633 version:4.6.0+20240313.8278d949
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-03-03
20:20:06.939554675 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1770/crmsh.changes2024-03-13
22:22:26.700827362 +0100
@@ -1,0 +2,25 @@
+Wed Mar 13 14:26:02 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240313.8278d949:
+ * Fix: utils: set env `CIB_shadow` using `os.environ` (bsc#1205925)
+ * Fix: pass env to child process explicitly (bsc#1205925)
+ * Fix: term: unset env `COLUMNS` and `ROWS` (bsc#1205925)
+ * Dev: unittest: update unit tests for previous changes
+ * Fix: sh: pass env to child process explicitly (bsc#1205925)
+
+---
+Wed Mar 13 10:43:31 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240313.0c382be4:
+ * Dev: sh: Fix typo in docstring
+
+---
+Tue Mar 12 07:04:54 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240312.24df92aa:
+ * Dev: unittest: Adjust unit test for previous change
+ * Fix: bootstrap: Remove unused -i option when calling csync2_remote and
ssh_remote stage (bsc#1212080)
+ * Dev: unitest: Adjust unit test for previous change
+ * Fix: report: Show different perspectives of cluster
+
+---
Old:
crmsh-4.6.0+20240227.21cbb9ee.tar.bz2
New:
crmsh-4.6.0+20240313.8278d949.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.nkNuWm/_old 2024-03-13 22:22:27.312849951 +0100
+++ /var/tmp/diff_new_pack.nkNuWm/_new 2024-03-13 22:22:27.312849951 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240227.21cbb9ee
+Version:4.6.0+20240313.8278d949
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.nkNuWm/_old 2024-03-13 22:22:27.340850984 +0100
+++ /var/tmp/diff_new_pack.nkNuWm/_new 2024-03-13 22:22:27.344851132 +0100
@@ -4,7 +4,7 @@
git
crmsh
@PARENT_TAG@+%cd.%h
-(\d+\.\d+\.\d+)(?:-rc\d+)?(.*)
+(\d+\.\d+\.\d+)(?:-[a-z]+\d*)?(.*)
\1\2
crmsh-4.6
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.nkNuWm/_old 2024-03-13 22:22:27.364851870 +0100
+++ /var/tmp/diff_new_pack.nkNuWm/_new 2024-03-13 22:22:27.368852017 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 3bb63a078a6a1b93aff92c888cdb257db94310d7
+ 8278d9498f904df34feebd387225eecd2cca21f4
(No newline at EOF)
++ crmsh-4.6.0+20240227.21cbb9ee.tar.bz2 ->
crmsh-4.6.0+20240313.8278d949.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240227.21cbb9ee/crmsh/bootstrap.py
new/crmsh-4.6.0+20240313.8278d949/crmsh/bootstrap.py
--- old/crmsh-4.6.0+20240227.21cbb9ee/crmsh/bootstrap.py2024-02-27
15:46:22.0 +0100
+++ new/crmsh-4.6.0+20240313.8278d949/crmsh/bootstrap.py2024-03-13
14:56:37.0 +0100
@@ -1767,8 +1767,8 @@
if not ssh_public_keys:
local_shell.get_stdout_or_raise_error(
local_user,
-"ssh {} {}@{} sudo crm cluster init -i {} ssh_remote".format(
-SSH_OPTION, seed_user, seed_host, _context.default_nic_list[0],
+"ssh {} {}@{} sudo crm cluster init ssh_remote".format(
+SSH_OPTION, seed_user, seed_host
),
)
user_by_host = utils.HostUserConfig()
@@ -1882,7 +1882,7 @@
# If we *were* updating /etc/hosts, the next line would have
"\"$hosts_line\"" as
# the last arg (but this requires re-enabling this functionality in
ha-cluster-init)
shell = sh.cluster_shell()
-cmd = "crm cluster init -i {} csync2_remote
{}".format(_context.default_nic_list[0], utils.this_node())
+cmd = "crm cluster init csync2_remote {}".format(utils.this_node())
shell.get_stdout_or_raise_error(cmd, seed_host)
# This is necessary if syncing /etc/hosts (to ensure everyone's got the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20240227.21cbb9ee/crmsh/report/collect.py
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-01-26 22:47:46
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1815 (New)
Package is "crmsh"
Fri Jan 26 22:47:46 2024 rev:323 rq:1141679 version:4.6.0+20240126.e227ccf6
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-01-25
18:40:35.421340767 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1815/crmsh.changes2024-01-26
22:47:58.689734118 +0100
@@ -1,0 +2,10 @@
+Fri Jan 26 07:47:11 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240126.e227ccf6:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: behave: Add functional test for previous change
+ * Dev: report: Enable crm report even cib.xml does not exist
+ * Dev: utils: Query pacemaker_remote node correctly
+ * Fix: ui_cluster: Can't start cluster with --all option if no cib
(bsc#1219052)
+
+---
Old:
crmsh-4.6.0+20240124.feea55a9.tar.bz2
New:
crmsh-4.6.0+20240126.e227ccf6.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.XD70jX/_old 2024-01-26 22:47:59.413760191 +0100
+++ /var/tmp/diff_new_pack.XD70jX/_new 2024-01-26 22:47:59.413760191 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240124.feea55a9
+Version:4.6.0+20240126.e227ccf6
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.XD70jX/_old 2024-01-26 22:47:59.473762352 +0100
+++ /var/tmp/diff_new_pack.XD70jX/_new 2024-01-26 22:47:59.477762497 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- feea55a985585b794983c629dfb12a4c0d99270b
+ e227ccf6be0b408bf63d7e949ea207cad08c76d8
(No newline at EOF)
++ crmsh-4.6.0+20240124.feea55a9.tar.bz2 ->
crmsh-4.6.0+20240126.e227ccf6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20240124.feea55a9/crmsh/report/collect.py
new/crmsh-4.6.0+20240126.e227ccf6/crmsh/report/collect.py
--- old/crmsh-4.6.0+20240124.feea55a9/crmsh/report/collect.py 2024-01-24
02:10:16.0 +0100
+++ new/crmsh-4.6.0+20240126.e227ccf6/crmsh/report/collect.py 2024-01-26
08:23:47.0 +0100
@@ -386,6 +386,9 @@
logger.debug(f"Touch file 'RUNNING' in {utils.real_path(workdir)}")
else:
# TODO should determine offline node was ha node
+if not os.path.isfile(os.path.join(context.cib_dir, constants.CIB_F)):
+logger.warning(f"Cannot find cib.xml in {context.cib_dir}")
+return
shutil.copy2(os.path.join(context.cib_dir, constants.CIB_F), workdir)
crmutils.str2file("", os.path.join(workdir, "STOPPED"))
logger.debug(f"Touch file 'STOPPED' in {utils.real_path(workdir)}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240124.feea55a9/crmsh/report/utils.py
new/crmsh-4.6.0+20240126.e227ccf6/crmsh/report/utils.py
--- old/crmsh-4.6.0+20240124.feea55a9/crmsh/report/utils.py 2024-01-24
02:10:16.0 +0100
+++ new/crmsh-4.6.0+20240126.e227ccf6/crmsh/report/utils.py 2024-01-26
08:23:47.0 +0100
@@ -500,7 +500,9 @@
"""
Prepare the data and files for the sanitization process
"""
-self._load_cib_from_work_dir()
+self.cib_data = self._load_cib_from_work_dir()
+if not self.cib_data:
+return False
self._parse_sensitive_set()
self._extract_sensitive_value_list()
@@ -508,11 +510,13 @@
if not self.context.sanitize:
logger.warning("Some PE/CIB/log files contain possibly
sensitive data")
logger.warning("Using \"-s\" option can replace sensitive
data")
-return
+return False
self._get_file_list_in_work_dir()
else:
self.context.sanitize = False
+return True
+
def _include_sensitive_data(self) -> List[str]:
"""
Check whether contain sensitive data
@@ -533,11 +537,8 @@
"""
cib_file_list =
glob.glob(f"{self.context.work_dir}/*/{constants.CIB_F}")
if not cib_file_list:
-raise ReportGenericError(f"CIB file {constants.CIB_F} was not
collected")
-data = crmutils.read_from_file(cib_file_list[0])
-if not data:
-raise
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2024-01-23 22:57:23
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.16006 (New)
Package is "crmsh"
Tue Jan 23 22:57:23 2024 rev:321 rq:1141003 version:4.6.0+20240123.680089b0
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2024-01-09
20:50:48.090724770 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.16006/crmsh.changes 2024-01-23
22:57:36.307620015 +0100
@@ -1,0 +2,16 @@
+Tue Jan 23 08:50:35 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240123.680089b0:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: testcases: Adjust original regression test cases
+ * Dev: behave: Adjust functional test for previous change
+ * Fix: parse: Automatically append 's' as default time unit for timeout and
interval (#1304)
+ * Dev: ui_configure: Update the operation id after the monitor interval
changed
+
+---
+Tue Jan 09 09:02:11 UTC 2024 - xli...@suse.com
+
+- Update to version 4.6.0+20240109.1eb53276:
+ * Dev: ChangeLog: update ChangeLog for release 4.6.0
+
+---
Old:
crmsh-4.6.0+20240109.288ef6c4.tar.bz2
New:
crmsh-4.6.0+20240123.680089b0.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.yUiwCL/_old 2024-01-23 22:57:36.871640637 +0100
+++ /var/tmp/diff_new_pack.yUiwCL/_new 2024-01-23 22:57:36.871640637 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20240109.288ef6c4
+Version:4.6.0+20240123.680089b0
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.yUiwCL/_old 2024-01-23 22:57:36.907641954 +0100
+++ /var/tmp/diff_new_pack.yUiwCL/_new 2024-01-23 22:57:36.907641954 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 5f1fb4db03cceb407e529c1c369fb0472cc06bb6
+ 680089b02364187fb8a0ac27819d07ac5dc4e273
(No newline at EOF)
++ crmsh-4.6.0+20240109.288ef6c4.tar.bz2 ->
crmsh-4.6.0+20240123.680089b0.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240109.288ef6c4/ChangeLog
new/crmsh-4.6.0+20240123.680089b0/ChangeLog
--- old/crmsh-4.6.0+20240109.288ef6c4/ChangeLog 2024-01-09 04:56:33.0
+0100
+++ new/crmsh-4.6.0+20240123.680089b0/ChangeLog 2024-01-23 09:26:56.0
+0100
@@ -1,3 +1,9 @@
+* Tue Jan 9 2024 Xin Liang
+- Release 4.6.0
+- Fix: report: Unable to gather log files that are in the syslog format
(bsc#1218491)
+- Dev: ui_corosync: Add a completer for corosync.set to enumerate all current
paths
+- Dev: bootstrap: Assign hosts with _context.node_list_in_cluster in
join_ssh_merge (bsc#1218331)
+
* Fri Dec 22 2023 Xin Liang
- Release 4.6.0 rc2
- Dev: ui_cluster: Move --use-ssh-agent to optional arguments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20240109.288ef6c4/crmsh/parse.py
new/crmsh-4.6.0+20240123.680089b0/crmsh/parse.py
--- old/crmsh-4.6.0+20240109.288ef6c4/crmsh/parse.py2024-01-09
04:56:33.0 +0100
+++ new/crmsh-4.6.0+20240123.680089b0/crmsh/parse.py2024-01-23
09:26:56.0 +0100
@@ -12,7 +12,7 @@
from . import schema
from .utils import keyword_cmp, verify_boolean, lines2cli
from .utils import get_boolean, olist, canonical_boolean
-from .utils import handle_role_for_ocf_1_1, compatible_role
+from .utils import handle_role_for_ocf_1_1, compatible_role,
add_time_unit_if_needed
from . import xmlutil
from . import log
@@ -700,9 +700,9 @@
constants.DEFAULT_INTERVAL_IN_ACTION
adv_timeout = extract_advised_value(action_advised_attr_dict,
action, 'timeout', op_node.get('role'))
if op_node.get('interval') is None:
-op_node.set('interval', adv_interval)
+op_node.set('interval',
add_time_unit_if_needed(adv_interval))
if op_node.get('timeout') is None and adv_timeout:
-op_node.set('timeout', adv_timeout)
+op_node.set('timeout',
add_time_unit_if_needed(adv_timeout))
configured_action_list.append(action)
for action in action_advised_attr_dict:
@@ -717,9 +717,15 @@
for k, v in v_dict.items():
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-28 23:03:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.28375 (New)
Package is "crmsh"
Thu Dec 28 23:03:11 2023 rev:319 rq:1135428 version:4.6.0+20231228.83bf1514
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-25
19:06:34.236263716 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.28375/crmsh.changes 2023-12-28
23:04:53.813971611 +0100
@@ -1,0 +2,6 @@
+Thu Dec 28 06:39:58 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231228.83bf1514:
+ * Dev: ui_corosync: Add a completer for corosync.set to enumerate all
current paths
+
+---
Old:
crmsh-4.6.0+20231225.3e2ff633.tar.bz2
New:
crmsh-4.6.0+20231228.83bf1514.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.f27d3p/_old 2023-12-28 23:04:54.357991494 +0100
+++ /var/tmp/diff_new_pack.f27d3p/_new 2023-12-28 23:04:54.357991494 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231225.3e2ff633
+Version:4.6.0+20231228.83bf1514
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.f27d3p/_old 2023-12-28 23:04:54.397992956 +0100
+++ /var/tmp/diff_new_pack.f27d3p/_new 2023-12-28 23:04:54.401993102 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 3e2ff6330cd5ae8b9b03dc5859b59a5fe1825245
+ 9d112588eac7099ed2c95f01e50ef1b7ab7a4bc4
(No newline at EOF)
++ crmsh-4.6.0+20231225.3e2ff633.tar.bz2 ->
crmsh-4.6.0+20231228.83bf1514.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231225.3e2ff633/crmsh/ui_corosync.py
new/crmsh-4.6.0+20231228.83bf1514/crmsh/ui_corosync.py
--- old/crmsh-4.6.0+20231225.3e2ff633/crmsh/ui_corosync.py 2023-12-25
08:18:56.0 +0100
+++ new/crmsh-4.6.0+20231228.83bf1514/crmsh/ui_corosync.py 2023-12-28
07:16:15.0 +0100
@@ -168,6 +168,7 @@
print(v)
@command.skill_level('administrator')
+@command.completers(completers.call(corosync.get_all_paths))
def do_set(self, context, path, value):
"Set a corosync configuration value"
corosync.set_value(path, value)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-25 19:06:21
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.28375 (New)
Package is "crmsh"
Mon Dec 25 19:06:21 2023 rev:318 rq:1135078 version:4.6.0+20231225.3e2ff633
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-22
22:42:10.493851288 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.28375/crmsh.changes 2023-12-25
19:06:34.236263716 +0100
@@ -1,0 +2,6 @@
+Mon Dec 25 07:42:42 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231225.3e2ff633:
+ * Dev: bootstrap: Assign hosts with _context.node_list_in_cluster in
join_ssh_merge (bsc#1218331)
+
+---
Old:
crmsh-4.6.0+20231222.b7650ca3.tar.bz2
New:
crmsh-4.6.0+20231225.3e2ff633.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.yWbnX0/_old 2023-12-25 19:06:34.836285613 +0100
+++ /var/tmp/diff_new_pack.yWbnX0/_new 2023-12-25 19:06:34.836285613 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231222.b7650ca3
+Version:4.6.0+20231225.3e2ff633
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.yWbnX0/_old 2023-12-25 19:06:34.880287219 +0100
+++ /var/tmp/diff_new_pack.yWbnX0/_new 2023-12-25 19:06:34.884287365 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 931a93065cd87e63b43cab81098ddc86ed5c800d
+ 3e2ff6330cd5ae8b9b03dc5859b59a5fe1825245
(No newline at EOF)
++ crmsh-4.6.0+20231222.b7650ca3.tar.bz2 ->
crmsh-4.6.0+20231225.3e2ff633.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231222.b7650ca3/crmsh/bootstrap.py
new/crmsh-4.6.0+20231225.3e2ff633/crmsh/bootstrap.py
--- old/crmsh-4.6.0+20231222.b7650ca3/crmsh/bootstrap.py2023-12-22
09:28:38.0 +0100
+++ new/crmsh-4.6.0+20231225.3e2ff633/crmsh/bootstrap.py2023-12-25
08:18:56.0 +0100
@@ -1914,10 +1914,7 @@
"""
logger.info("Merging known_hosts")
-hosts = utils.list_cluster_nodes()
-if hosts is None:
-hosts = list()
-hosts.append(cluster_node)
+hosts = _context.node_list_in_cluster
shell = sh.cluster_shell()
# create local entry in known_hosts
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-15 21:49:24
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25432 (New)
Package is "crmsh"
Fri Dec 15 21:49:24 2023 rev:316 rq:1133257 version:4.6.0+20231215.4b06740f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-12
19:32:36.897313091 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25432/crmsh.changes 2023-12-15
21:49:35.623247727 +0100
@@ -1,0 +2,16 @@
+Fri Dec 15 07:25:30 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231215.4b06740f:
+ * Fix: github-actions: fix file owner for git
+ * Dev: github-actions: update container image used in CD
+
+---
+Thu Dec 14 08:21:04 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0rc1+20231214.b2728f3b:
+ * Dev: behave: Adjust functional test for previous change
+ * Dev: ui_cluster: Move --use-ssh-agent to optional arguments
+ * Fix: autoconf: --with-version does not override the variable used in
`version.in`
+ * Dev: unify version string used in setup.py and autotools
+
+---
Old:
crmsh-4.6.0+20231212.54751d3f.tar.bz2
New:
crmsh-4.6.0+20231215.4b06740f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.S9eHSR/_old 2023-12-15 21:49:36.203269068 +0100
+++ /var/tmp/diff_new_pack.S9eHSR/_new 2023-12-15 21:49:36.207269215 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231212.54751d3f
+Version:4.6.0+20231215.4b06740f
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.S9eHSR/_old 2023-12-15 21:49:36.235270245 +0100
+++ /var/tmp/diff_new_pack.S9eHSR/_new 2023-12-15 21:49:36.239270393 +0100
@@ -3,7 +3,9 @@
https://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.6.0+%cd.%h
+@PARENT_TAG@+%cd.%h
+(\d+\.\d+\.\d+)(?:-rc\d+)?(.*)
+\1\2
crmsh-4.6
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.S9eHSR/_old 2023-12-15 21:49:36.259271128 +0100
+++ /var/tmp/diff_new_pack.S9eHSR/_new 2023-12-15 21:49:36.263271276 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- db02a38df79fc1e1ee20c9dc4d1c39028e2c3c11
+ 45d75431d8a38cd927519ca927cbc75e1e4dad7c
(No newline at EOF)
++ crmsh-4.6.0+20231212.54751d3f.tar.bz2 ->
crmsh-4.6.0+20231215.4b06740f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20231212.54751d3f/.github/workflows/crmsh-cd.yml
new/crmsh-4.6.0+20231215.4b06740f/.github/workflows/crmsh-cd.yml
--- old/crmsh-4.6.0+20231212.54751d3f/.github/workflows/crmsh-cd.yml
2023-12-12 03:47:05.0 +0100
+++ new/crmsh-4.6.0+20231215.4b06740f/.github/workflows/crmsh-cd.yml
2023-12-15 07:49:46.0 +0100
@@ -7,8 +7,8 @@
on: push
env:
- FOLDER: /package
PACKAGE_NAME: crmsh
+ CONTAINER_IMAGE: nyang23/obs-continuous-delivery:latest
OBS_USER: ${{ secrets.OBS_USER }}
OBS_PASS: ${{ secrets.OBS_PASS }}
OBS_PROJECT: ${{ secrets.OBS_PROJECT_CRMSH45 }}
@@ -28,15 +28,14 @@
- uses: actions/checkout@v3
- name: delivery process
run: |
-docker pull shap/continuous_deliver:latest
-docker run -t -v "$(pwd):/package" \
+docker pull "${CONTAINER_IMAGE}"
+docker run -t -v "$(pwd)":/package:ro \
-e OBS_USER=$OBS_USER \
-e OBS_PASS=$OBS_PASS \
- -e FOLDER=$FOLDER \
-e OBS_PROJECT=$OBS_PROJECT \
-e PACKAGE_NAME=$PACKAGE_NAME \
- shap/continuous_deliver \
- /bin/bash -c "cd /package;/scripts/upload.sh"
+ "${CONTAINER_IMAGE}" \
+ /bin/bash -c "cp -r /package ~/package && cd ~/package &&
/scripts/upload.sh"
submit:
if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.6'
@@ -47,12 +46,12 @@
- uses: actions/checkout@v3
- name: submit process
run: |
-docker pull shap/continuous_deliver:latest
-docker run -t -v "$(pwd):/package" \
+docker pull "${CONTAINER_IMAGE}"
+docker run -t \
-e OBS_USER=$OBS_USER \
-e OBS_PASS=$OBS_PASS \
-e OBS_PROJECT=$OBS_PROJECT \
-e PACKAGE_NAME=$PACKAGE_NAME \
-e TARGET_PROJECT=$TARGET_PROJECT \
-
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-12 19:32:14
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25432 (New)
Package is "crmsh"
Tue Dec 12 19:32:14 2023 rev:315 rq:1132598 version:4.6.0+20231212.54751d3f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-11
21:51:15.809111225 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25432/crmsh.changes 2023-12-12
19:32:36.897313091 +0100
@@ -1,0 +2,8 @@
+Tue Dec 12 03:10:42 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231212.54751d3f:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: behave: Add functional test for previous change
+ * Fix: ui_cluster: Improve the process of 'crm cluster stop' (bsc#1213889)
+
+---
Old:
crmsh-4.6.0+20231211.4b74412a.tar.bz2
New:
crmsh-4.6.0+20231212.54751d3f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.nBsgRl/_old 2023-12-12 19:32:37.505335526 +0100
+++ /var/tmp/diff_new_pack.nBsgRl/_new 2023-12-12 19:32:37.505335526 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231211.4b74412a
+Version:4.6.0+20231212.54751d3f
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.nBsgRl/_old 2023-12-12 19:32:37.545337002 +0100
+++ /var/tmp/diff_new_pack.nBsgRl/_new 2023-12-12 19:32:37.549337150 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- a23bea64548038b55b3650ae73cb3b88f025ad68
+ db02a38df79fc1e1ee20c9dc4d1c39028e2c3c11
(No newline at EOF)
++ crmsh-4.6.0+20231211.4b74412a.tar.bz2 ->
crmsh-4.6.0+20231212.54751d3f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231211.4b74412a/crmsh/ui_cluster.py
new/crmsh-4.6.0+20231212.54751d3f/crmsh/ui_cluster.py
--- old/crmsh-4.6.0+20231211.4b74412a/crmsh/ui_cluster.py 2023-12-11
03:36:33.0 +0100
+++ new/crmsh-4.6.0+20231212.54751d3f/crmsh/ui_cluster.py 2023-12-12
03:47:05.0 +0100
@@ -193,42 +193,77 @@
for node in node_list:
logger.info("The cluster stack started on {}".format(node))
-@command.skill_level('administrator')
-def do_stop(self, context, *args):
-'''
-Stops the cluster stack on all nodes or specific node(s)
-'''
+@staticmethod
+def _node_ready_to_stop_cluster_service(node):
+"""
+Check if the specific node is ready to stop cluster service
+
+If both corosync.service and pacemaker.service is active, return True
+If some services started, stop them first and return False
+"""
service_manager = ServiceManager()
-node_list = parse_option_for_nodes(context, *args)
-for node in node_list[:]:
-if not service_manager.service_is_active("corosync.service",
remote_addr=node):
-if service_manager.service_is_active("sbd.service",
remote_addr=node):
-service_manager.stop_service("corosync", remote_addr=node)
-logger.info("The cluster stack stopped on {}".format(node))
-else:
-logger.info("The cluster stack already stopped on
{}".format(node))
-node_list.remove(node)
-elif not service_manager.service_is_active("pacemaker.service",
remote_addr=node):
+
+corosync_active =
service_manager.service_is_active("corosync.service", remote_addr=node)
+sbd_active = service_manager.service_is_active("sbd.service",
remote_addr=node)
+pacemaker_active =
service_manager.service_is_active("pacemaker.service", remote_addr=node)
+
+if not corosync_active:
+if sbd_active:
service_manager.stop_service("corosync", remote_addr=node)
-logger.info("The cluster stack stopped on {}".format(node))
-node_list.remove(node)
-if not node_list:
+logger.info(f"The cluster stack stopped on {node}")
+else:
+logger.info(f"The cluster stack already stopped on {node}")
+return False
+
+elif not pacemaker_active:
+service_manager.stop_service("corosync", remote_addr=node)
+logger.info("The cluster stack stopped on {}".format(node))
+
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-11 21:51:03
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25432 (New)
Package is "crmsh"
Mon Dec 11 21:51:03 2023 rev:314 rq:1132388 version:4.6.0+20231211.4b74412a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-07
19:12:55.088820500 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25432/crmsh.changes 2023-12-11
21:51:15.809111225 +0100
@@ -1,0 +2,17 @@
+Mon Dec 11 03:00:33 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231211.4b74412a:
+ * Fix: scripts.health: call `setup_logging()` before importing
crmsh.reprot.utils
+ * Dev: unittest: adjuest unit tests for previous changes
+ * Dev: behave: adjust regression tests for previous changes
+ * Dev: log: save backtrace of ValueError in logfile and suppress it in
console
+ * Refactor: log: use levelno instead levelname to filter logs
+ * Refactor: log: implement lineno in Logger instead of handler
+ * Refactor: log: remove FileCustomFormatter
+ * Refactor: log: remove ConsoleReportFormatter
+ * Refactor: log: add LeveledFormatter to use different formats for different
log levels
+ * Refactor: log: unused code removal
+ * Refactor: log: refactor DEBUG2 into a standard Logger interface
+ * Refactor: log: refactor ConsoleCustomFormatter
+
+---
Old:
crmsh-4.6.0+20231207.89c74e6c.tar.bz2
New:
crmsh-4.6.0+20231211.4b74412a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.kVcgJQ/_old 2023-12-11 21:51:16.369132005 +0100
+++ /var/tmp/diff_new_pack.kVcgJQ/_new 2023-12-11 21:51:16.373132154 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231207.89c74e6c
+Version:4.6.0+20231211.4b74412a
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.kVcgJQ/_old 2023-12-11 21:51:16.409133489 +0100
+++ /var/tmp/diff_new_pack.kVcgJQ/_new 2023-12-11 21:51:16.409133489 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 89aab78af02c02a04ef9bc99be3386825bda2ae5
+ a23bea64548038b55b3650ae73cb3b88f025ad68
(No newline at EOF)
++ crmsh-4.6.0+20231207.89c74e6c.tar.bz2 ->
crmsh-4.6.0+20231211.4b74412a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231207.89c74e6c/crmsh/log.py
new/crmsh-4.6.0+20231211.4b74412a/crmsh/log.py
--- old/crmsh-4.6.0+20231207.89c74e6c/crmsh/log.py 2023-12-07
10:20:33.0 +0100
+++ new/crmsh-4.6.0+20231211.4b74412a/crmsh/log.py 2023-12-11
03:36:33.0 +0100
@@ -6,15 +6,73 @@
import shutil
import logging
import logging.config
+import typing
from contextlib import contextmanager
from . import options
from . import constants
-
+DEBUG2 = logging.DEBUG + 5
CRMSH_LOG_FILE = "/var/log/crmsh/crmsh.log"
+class DEBUG2Logger(logging.Logger):
+def __init__(self, *args, **kwargs):
+super().__init__(*args, **kwargs)
+
+def debug2(self, msg, *args, **kwargs):
+if self.isEnabledFor(DEBUG2):
+self._log(DEBUG2, msg, args, **kwargs)
+
+
+class NumberedLoggerInterface(DEBUG2Logger):
+"""
+Interface to prepend a number to the message, used for regression test.
When this class is used directly, no numbers are prepend.
+"""
+lineno = -1
+
+@classmethod
+def reset_lineno(cls, to=0):
+pass
+
+@classmethod
+def incr_lineno(cls):
+pass
+
+
+class NumberedLogger(NumberedLoggerInterface):
+"""
+Prepend a number to the message, used for regression test
+"""
+lineno = -1
+
+def _log( self, level, msg, args, **kwargs):
+if NumberedLogger.lineno > 0:
+msg = f'{self.lineno}: {msg}'
+super()._log(level, msg, args, **kwargs)
+
+@classmethod
+def reset_lineno(cls, to=0):
+cls.lineno = to
+
+@classmethod
+def incr_lineno(cls):
+cls.lineno += 1
+
+if (sys.version_info.major, sys.version_info.minor) > (3, 6):
+def findCaller(self, stack_info=False, stacklevel=1):
+return super().findCaller(stack_info, stacklevel+1)
+else:
+def findCaller(self, stack_info=False):
+if stack_info:
+return super().findCaller(stack_info)
+else:
+f = sys._getframe(4)
+
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-07 19:11:15
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25432 (New)
Package is "crmsh"
Thu Dec 7 19:11:15 2023 rev:313 rq:1131570 version:4.6.0+20231207.89c74e6c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-06
23:49:13.465440189 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25432/crmsh.changes 2023-12-07
19:12:55.088820500 +0100
@@ -1,0 +2,6 @@
+Thu Dec 07 09:44:56 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231207.89c74e6c:
+ * Dev: ChangeLog: update ChangeLog for release 4.6.0-rc1
+
+---
Old:
crmsh-4.6.0+20231206.a903b854.tar.bz2
New:
crmsh-4.6.0+20231207.89c74e6c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.OXj6aK/_old 2023-12-07 19:12:56.664878641 +0100
+++ /var/tmp/diff_new_pack.OXj6aK/_new 2023-12-07 19:12:56.668878789 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231206.a903b854
+Version:4.6.0+20231207.89c74e6c
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.OXj6aK/_old 2023-12-07 19:12:56.700879969 +0100
+++ /var/tmp/diff_new_pack.OXj6aK/_new 2023-12-07 19:12:56.704880117 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- a903b85403909d658450412245d4c322b4501ab5
+ 89aab78af02c02a04ef9bc99be3386825bda2ae5
(No newline at EOF)
++ crmsh-4.6.0+20231206.a903b854.tar.bz2 ->
crmsh-4.6.0+20231207.89c74e6c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231206.a903b854/ChangeLog
new/crmsh-4.6.0+20231207.89c74e6c/ChangeLog
--- old/crmsh-4.6.0+20231206.a903b854/ChangeLog 2023-12-06 08:17:04.0
+0100
+++ new/crmsh-4.6.0+20231207.89c74e6c/ChangeLog 2023-12-07 10:20:33.0
+0100
@@ -1,4 +1,74 @@
-* Thu Mar 30 2023 Xin Liang
+*Thu Dec 7 2023 Xin Liang
+- Release 4.6.0 rc1
+- Dev: doc: Unify contents of manpage and help info
+- Dev: report: Rewrite crm report module
+- Dev: utils: To prevent shell injection, manipulate the argument array
instead of the command line string
+- Fix: bootstrap: fix the owner and permission of file authorized_keys
(bsc#1217279)
+- Fix: prun: should not call user_pair_for_ssh() when target host is localhost
(bsc#1217094)
+- Dev: report: Redirect warning and error from remote node into stderr
+- Fix: utils: Add 'sudo' only when there is a sudoer(bsc#1215549)
+- Dev: xmlutil: refactor class CrmMonXmlParser
+- Dev: completers: Add online_nodes and standby_nodes
+- Fix: bootstrap: add informative logging for generating new ssh keypairs
+- Fix: forward ssh-agent for `crm report __slave`
+- Fix: sh: raise AuthorizationError and generate diagnose messages when
ClusterShell fails with 255
+- Dev: bootstrap: allow to authenticate interactively in `crm cluster join
--use-ssh-agent`
+- Dev: ssh-agent: add informative logging for adding keys to authorized_keys
+- Dev: ssh-agent: add diagnose messages
+- Dev: bootstrap: implement ssh-agent support for geo cluster (jsc#PED-5774)
+- Dev: bootstrap: refine key swap for user `hacluster`
+- Dev: bootstrap: implement ssh-agent support for qdevice (jsc#PED-5774)
+- Dev: bootstrap: implement ssh-agent support (jsc#PED-5774)
+- Dev: ui_utils: Supports '=' when setting node/resource attributes
+- Fix: report: Pick up tarball suffix dynamically (bsc#1215438)
+- Fix: report: Pick 'gzip' as the first compress prog for cross-platform
compatibility(bsc#1215438)
+- Fix: constants: Add several resource meta attributes (bsc#1215319)
+- refactor: move get_stdout and get_stdout_stderr to crmsh.sh.ShellUtils
+- Dev: refactor shell calling routines
+- Dev: utils: strip new line when get_stdout_or_raise_error returns
+- Fix: prun: setsid to prevent ssh from asking a password from terminal
+- Fix: upgradeutil: reduce the timeout for getting sequence from remote node
(bsc#1213797)
+- Fix: userdir: Get the effictive user name instead of using getpass.getuser
(bsc#1213821)
+- Dev: requirements: remove parallax
+- Fix: upgradeutil: support the change of path of upgrade_seq in crmsh-4.5
(bsc#1213050)
+- Fix: ui_context: wait4dc should assume a subcommand completes successfully
if no exceptions are raised (bsc#1212992)
+- Fix: upgradeutil: do not tried to upgrade when the cluster is
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-12-06 23:48:35
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25432 (New)
Package is "crmsh"
Wed Dec 6 23:48:35 2023 rev:312 rq:1131270 version:4.6.0+20231206.a903b854
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-12-05
17:03:30.089778526 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25432/crmsh.changes 2023-12-06
23:49:13.465440189 +0100
@@ -1,0 +2,27 @@
+Wed Dec 06 07:40:45 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231206.a903b854:
+ * Dev: unittest: Add unit test for crm report module
+ * Dev: report: Consider ssh agent case in crm report
+ * Dev: behave: Complete test case for crm report with ssh-agent
+ * Dev: report: Use ast.literal_eval instead of eval
+ * Dev: utils: Rename utils.check_space_option_value to
utils.check_empty_option_value
+ * Dev: behave: Add 'No crmsh tracebacks' assert
+ * Dev: report: Consolidate utils.read_from_file
+ * Dev: codecov.yml: Increase code coverage threshold as 0.35%
+ * Dev: behave: Adjust functional behave test for previous changes
+ * Dev: doc: Unify contents of manpage and help info
+ * Dev: report: Rewrite crm report module
+ * Dev: utils: Remove unused codes
+ * Dev: config: Exclude pacemaker.log from collect_extra_logs
+ * Dev: log: Add funcName for DEBUG2 log level
+
+---
+Tue Dec 05 09:02:43 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231205.38304a77:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: xmlutil: refactor class CrmMonXmlParser
+ * Dev: completers: Add online_nodes and standby_nodes
+
+---
Old:
crmsh-4.6.0+20231205.779324d5.tar.bz2
New:
crmsh-4.6.0+20231206.a903b854.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.53tmda/_old 2023-12-06 23:49:14.073462163 +0100
+++ /var/tmp/diff_new_pack.53tmda/_new 2023-12-06 23:49:14.077462307 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231205.779324d5
+Version:4.6.0+20231206.a903b854
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.53tmda/_old 2023-12-06 23:49:14.109463465 +0100
+++ /var/tmp/diff_new_pack.53tmda/_new 2023-12-06 23:49:14.109463465 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 779324d5813a565e341243d9784be62c2b256622
+ a903b85403909d658450412245d4c322b4501ab5
(No newline at EOF)
++ crmsh-4.6.0+20231205.779324d5.tar.bz2 ->
crmsh-4.6.0+20231206.a903b854.tar.bz2 ++
8295 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-11-13 22:21:40
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.17445 (New)
Package is "crmsh"
Mon Nov 13 22:21:40 2023 rev:308 rq:1125416 version:4.6.0+20231113.d7b4639a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-10-10
20:58:44.534692526 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.17445/crmsh.changes 2023-11-13
22:25:20.601383025 +0100
@@ -1,0 +2,13 @@
+Mon Nov 13 08:05:37 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231113.d7b4639a:
+ * Dev: behave: Adjust functional test for previous change
+ * Dev: ui_utils: Supports '=' when setting node/resource attributes
+
+---
+Mon Nov 13 05:29:55 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231113.1957d80b:
+ * Dev: cmd_status: Show error correctly for crm status
+
+---
Old:
crmsh-4.6.0+20231010.247218bf.tar.bz2
New:
crmsh-4.6.0+20231113.d7b4639a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.T2xlJk/_old 2023-11-13 22:25:21.577418961 +0100
+++ /var/tmp/diff_new_pack.T2xlJk/_new 2023-11-13 22:25:21.581419109 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.6.0+20231010.247218bf
+Version:4.6.0+20231113.d7b4639a
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.T2xlJk/_old 2023-11-13 22:25:21.629420876 +0100
+++ /var/tmp/diff_new_pack.T2xlJk/_new 2023-11-13 22:25:21.633421023 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 247218bf17eceaabc907832a93ec8fc981552c3a
+ d7b4639ae3c65c69f74727a098ebbe8d41628fcf
(No newline at EOF)
++ crmsh-4.6.0+20231010.247218bf.tar.bz2 ->
crmsh-4.6.0+20231113.d7b4639a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231010.247218bf/crmsh/cmd_status.py
new/crmsh-4.6.0+20231113.d7b4639a/crmsh/cmd_status.py
--- old/crmsh-4.6.0+20231010.247218bf/crmsh/cmd_status.py 2023-10-10
03:34:48.0 +0200
+++ new/crmsh-4.6.0+20231113.d7b4639a/crmsh/cmd_status.py 2023-11-13
08:35:49.0 +0100
@@ -88,7 +88,7 @@
_crm_mon = "%s -1" % (prog)
status_cmd = "%s %s" % (_crm_mon, opts)
-return shell.get_stdout(utils.add_sudo(status_cmd))
+return shell.get_stdout_stderr(utils.add_sudo(status_cmd))
def cmd_status(args):
@@ -117,9 +117,9 @@
extra = ' '.join(opts.get(arg, arg) for arg in args)
if not args:
extra = "-r"
-rc, s = crm_mon(extra)
+rc, s, err = crm_mon(extra)
if rc != 0:
-raise IOError("crm_mon (rc=%d): %s" % (rc, s))
+raise IOError(f"{err} (rc={rc})")
utils.page_string(CrmMonFilter()(s))
return True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.6.0+20231010.247218bf/crmsh/ui_utils.py
new/crmsh-4.6.0+20231113.d7b4639a/crmsh/ui_utils.py
--- old/crmsh-4.6.0+20231010.247218bf/crmsh/ui_utils.py 2023-10-10
03:34:48.0 +0200
+++ new/crmsh-4.6.0+20231113.d7b4639a/crmsh/ui_utils.py 2023-11-13
08:35:49.0 +0100
@@ -49,6 +49,8 @@
'''
try:
attr_cmd = _get_attr_cmd(attr_ext_commands, subcmd)
+if re.search("\w+=\w+", attr):
+attr, value = attr.split('=')
return _dispatch_attr_cmd(cmd, attr_cmd, rsc, subcmd, attr, value)
except ValueError as msg:
cmdline = [rsc, subcmd, attr]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.6.0+20231010.247218bf/test/features/configure_bugs.feature
new/crmsh-4.6.0+20231113.d7b4639a/test/features/configure_bugs.feature
--- old/crmsh-4.6.0+20231010.247218bf/test/features/configure_bugs.feature
2023-10-10 03:34:48.0 +0200
+++ new/crmsh-4.6.0+20231113.d7b4639a/test/features/configure_bugs.feature
2023-11-13 08:35:49.0 +0100
@@ -15,9 +15,12 @@
And Online nodes are "hanode1 hanode2"
# mask password by default
-WhenRun "crm node utilization hanode1 set password qwertyui" on
"hanode1"
+WhenRun "crm node utilization hanode1 set password=qwertyui" on
"hanode1"
WhenTry "crm configure show|grep password|grep qwertyui"
ThenExpected return
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-10-10 20:58:36
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.28202 (New)
Package is "crmsh"
Tue Oct 10 20:58:36 2023 rev:307 rq:1116550 version:4.6.0+20231010.247218bf
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-09-29
21:14:31.107793536 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.28202/crmsh.changes 2023-10-10
20:58:44.534692526 +0200
@@ -1,0 +2,22 @@
+Tue Oct 10 02:01:00 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231010.247218bf:
+ * Fix: report: Pick up tarball suffix dynamically (bsc#1215438)
+
+---
+Sun Oct 08 08:36:39 UTC 2023 - xli...@suse.com
+
+- Update to version 4.6.0+20231008.7a0df6c5:
+ * Fix: report: Pick 'gzip' as the first compress prog for cross-platform
compatibility(bsc#1215438)
+ * Fix: constants: Add several resource meta attributes (bsc#1215319)
+ * refactor: move get_stdout and get_stdout_stderr to crmsh.sh.ShellUtils
+ * refactor: remame SshShell to SSHShell refactor: remame AutoShell to
ClusterShell refactor: rename get_stdout_stderr* to get_rc_stdout_stderr*
refactor: rename get_raw_stdout_stderr* to get_rc_stdout_stderr_rc* refactor:
rename *_no_input to *_without_input add doc strings
+ * Dev: spec: Remove %generate_buildrequires to prevent OBS build failures on
SLE15SP5 and Leap15.5
+ * Dev: behave: adjust functional tests for previous changes
+ * Fix: unittest: fix several test cases for bootstarp.adjust_properties
+ * Dev: unittest: adjust unit tests for previous changes
+ * Dev: unittest: create unit tests for sh.py and service_manager.py
+ * Dev: refactor shell calling routines
+ * Dev: workflows: Enable delivery and submit CD stages for branch crmsh-4.6
+
+---
Old:
crmsh-4.5.0+20230928.7e006329.tar.bz2
New:
crmsh-4.6.0+20231010.247218bf.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.O7ufHD/_old 2023-10-10 20:58:46.074748373 +0200
+++ /var/tmp/diff_new_pack.O7ufHD/_new 2023-10-10 20:58:46.078748518 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230928.7e006329
+Version:4.6.0+20231010.247218bf
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -165,7 +165,6 @@
%if 0%{?suse_version}
%python3_pyproject_wheel
%else
-%generate_buildrequires
%pyproject_buildrequires -t
%pyproject_wheel
%endif
++ _service ++
--- /var/tmp/diff_new_pack.O7ufHD/_old 2023-10-10 20:58:46.110749678 +0200
+++ /var/tmp/diff_new_pack.O7ufHD/_new 2023-10-10 20:58:46.110749678 +0200
@@ -3,8 +3,8 @@
https://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.5.0+%cd.%h
-crmsh-4.5
+4.6.0+%cd.%h
+crmsh-4.6
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.O7ufHD/_old 2023-10-10 20:58:46.134750549 +0200
+++ /var/tmp/diff_new_pack.O7ufHD/_new 2023-10-10 20:58:46.134750549 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 7e0063292ddebf59ab521979309992a2602a7566
+ 247218bf17eceaabc907832a93ec8fc981552c3a
(No newline at EOF)
++ crmsh-4.5.0+20230928.7e006329.tar.bz2 ->
crmsh-4.6.0+20231010.247218bf.tar.bz2 ++
7213 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-09-29 21:13:27
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.28202 (New)
Package is "crmsh"
Fri Sep 29 21:13:27 2023 rev:306 rq:1113957 version:4.5.0+20230928.7e006329
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-09-20
13:33:09.091161684 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.28202/crmsh.changes 2023-09-29
21:14:31.107793536 +0200
@@ -1,0 +2,12 @@
+Thu Sep 28 03:29:51 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230928.7e006329:
+ * Fix: report: Pick 'gzip' as the first compress prog for cross-platform
compatibility(bsc#1215438)
+
+---
+Fri Sep 22 09:58:56 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230922.100fb67b:
+ * Fix: constants: Add several resource meta attributes (bsc#1215319)
+
+---
Old:
crmsh-4.5.0+20230920.7a060972.tar.bz2
New:
crmsh-4.5.0+20230928.7e006329.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.TZ9zIK/_old 2023-09-29 21:14:32.555845781 +0200
+++ /var/tmp/diff_new_pack.TZ9zIK/_new 2023-09-29 21:14:32.555845781 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230920.7a060972
+Version:4.5.0+20230928.7e006329
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.TZ9zIK/_old 2023-09-29 21:14:32.595847225 +0200
+++ /var/tmp/diff_new_pack.TZ9zIK/_new 2023-09-29 21:14:32.595847225 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 87f2182d748f0dd0d9b5c2e1a0d4c98bd1dfd148
+ 7e0063292ddebf59ab521979309992a2602a7566
(No newline at EOF)
++ crmsh-4.5.0+20230920.7a060972.tar.bz2 ->
crmsh-4.5.0+20230928.7e006329.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230920.7a060972/crmsh/constants.py
new/crmsh-4.5.0+20230928.7e006329/crmsh/constants.py
--- old/crmsh-4.5.0+20230920.7a060972/crmsh/constants.py2023-09-20
00:36:40.0 +0200
+++ new/crmsh-4.5.0+20230928.7e006329/crmsh/constants.py2023-09-28
05:03:50.0 +0200
@@ -212,7 +212,8 @@
"migration-threshold", "priority", "multiple-active",
"failure-timeout", "resource-stickiness", "target-role",
"restart-type", "description", "remote-node", "requires",
-"provides", "remote-port", "remote-addr", "remote-connect-timeout"
+"provides", "remote-port", "remote-addr", "remote-connect-timeout",
+"critical", "allow-unhealthy-nodes", "container-attribute-target"
)
common_meta_attributes = ("priority", "target-role", "is-managed")
group_meta_attributes = common_meta_attributes + ("container", )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230920.7a060972/crmsh/report/utillib.py
new/crmsh-4.5.0+20230928.7e006329/crmsh/report/utillib.py
--- old/crmsh-4.5.0+20230920.7a060972/crmsh/report/utillib.py 2023-09-20
00:36:40.0 +0200
+++ new/crmsh-4.5.0+20230928.7e006329/crmsh/report/utillib.py 2023-09-28
05:03:50.0 +0200
@@ -1126,7 +1126,7 @@
def pick_compress():
-constants.COMPRESS_PROG = pick_first(["bzip2", "gzip", "xz"])
+constants.COMPRESS_PROG = pick_first(["gzip", "bzip2", "xz"])
if constants.COMPRESS_PROG:
if constants.COMPRESS_PROG == "xz":
constants.COMPRESS_EXT = ".xz"
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-09-20 13:29:56
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.16627 (New)
Package is "crmsh"
Wed Sep 20 13:29:56 2023 rev:305 rq:1112416 version:4.5.0+20230920.7a060972
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-08-09
17:26:09.657719339 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.16627/crmsh.changes 2023-09-20
13:33:09.091161684 +0200
@@ -1,0 +2,36 @@
+Tue Sep 19 23:02:25 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230920.7a060972:
+ * Dev: workflows: Enable delivery and submit CD stages for branch crmsh-4.6
+
+---
+Mon Aug 21 08:35:13 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230821.76d42b85:
+ * Dev: codecov: allow minor drop (< 0.1%) in coverage checks
+ * [crmsh-4.5] Fix: github-actions: add condition to prevent crm-cd.yml
running in a forked repo
+
+---
+Wed Aug 16 14:26:30 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230816.24bf5f1f:
+ * Dev: utils: strip new line when get_stdout_or_raise_error returns
+
+---
+Thu Aug 10 09:15:15 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230810.74b9b4d5:
+ * Fix: codecov: delay notifications until all reports are uploaded
+ * Dev: behave: adjust functional tests for previous changes
+ * Dev: unittest: adjust unittest for previous changes
+ * Fix: prun: setsid to prevent ssh from asking a password from terminal
+ * Fix: upgradeutil: reduce the timeout for getting sequence from remote node
(bsc#1213797)
+
+---
+Thu Aug 10 02:12:36 UTC 2023 - nicholas.y...@suse.com
+
+- Update to version 4.5.0+20230810.01db025c:
+ * Dev: behave: Adjust functional test based on previous change
+ * Dev: corosync: Enable logging.to_logfile
+
+---
Old:
crmsh-4.5.0+20230809.ddb17a0b.tar.bz2
New:
crmsh-4.5.0+20230920.7a060972.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Xw9McO/_old 2023-09-20 13:33:10.895226315 +0200
+++ /var/tmp/diff_new_pack.Xw9McO/_new 2023-09-20 13:33:10.899226459 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230809.ddb17a0b
+Version:4.5.0+20230920.7a060972
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Xw9McO/_old 2023-09-20 13:33:10.931227605 +0200
+++ /var/tmp/diff_new_pack.Xw9McO/_new 2023-09-20 13:33:10.935227749 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 1b6bae9b438c538c644f68386b5a5ebcf92e4b91
+ 87f2182d748f0dd0d9b5c2e1a0d4c98bd1dfd148
(No newline at EOF)
++ crmsh-4.5.0+20230809.ddb17a0b.tar.bz2 ->
crmsh-4.5.0+20230920.7a060972.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230809.ddb17a0b/.github/workflows/crmsh-cd.yml
new/crmsh-4.5.0+20230920.7a060972/.github/workflows/crmsh-cd.yml
--- old/crmsh-4.5.0+20230809.ddb17a0b/.github/workflows/crmsh-cd.yml
2023-08-08 23:52:16.0 +0200
+++ new/crmsh-4.5.0+20230920.7a060972/.github/workflows/crmsh-cd.yml
2023-09-20 00:36:40.0 +0200
@@ -16,16 +16,17 @@
jobs:
integration:
+if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.6'
uses: ./.github/workflows/crmsh-ci.yml
delivery:
+if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.6'
needs: integration
runs-on: ubuntu-20.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: delivery process
- if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.5' && github.event_name == 'push'
run: |
docker pull shap/continuous_deliver:latest
docker run -t -v "$(pwd):/package" \
@@ -38,13 +39,13 @@
/bin/bash -c "cd /package;/scripts/upload.sh"
submit:
+if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.6'
needs: delivery
runs-on: ubuntu-20.04
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: submit process
- if: github.repository ==
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-08-09 17:26:05
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.11712 (New)
Package is "crmsh"
Wed Aug 9 17:26:05 2023 rev:304 rq:1103044 version:4.5.0+20230809.ddb17a0b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-07-26
13:24:56.136358746 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.11712/crmsh.changes 2023-08-09
17:26:09.657719339 +0200
@@ -1,0 +2,15 @@
+Tue Aug 08 22:45:16 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230809.ddb17a0b:
+ * Dev: github-workflows: do not build when push to a forked repo
+ * Fix: codecov: add token in plaintext
+ * Revert "Fix: codecov: specify token explicitly"
+ * Fix: userdir: Get the effictive user name instead of using getpass.getuser
(bsc#1213821)
+
+---
+Wed Jul 26 07:30:31 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230726.6efcdd30:
+ * Dev: requirements: remove parallax
+
+---
Old:
crmsh-4.5.0+20230725.5d35bb6c.tar.bz2
New:
crmsh-4.5.0+20230809.ddb17a0b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.4sbOzD/_old 2023-08-09 17:26:10.277723200 +0200
+++ /var/tmp/diff_new_pack.4sbOzD/_new 2023-08-09 17:26:10.281723225 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230725.5d35bb6c
+Version:4.5.0+20230809.ddb17a0b
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.4sbOzD/_old 2023-08-09 17:26:10.333723548 +0200
+++ /var/tmp/diff_new_pack.4sbOzD/_new 2023-08-09 17:26:10.337723573 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 5d35bb6c7915b3a158d022d3a89c698a06db9016
+ 1b6bae9b438c538c644f68386b5a5ebcf92e4b91
(No newline at EOF)
++ crmsh-4.5.0+20230725.5d35bb6c.tar.bz2 ->
crmsh-4.5.0+20230809.ddb17a0b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230725.5d35bb6c/.github/workflows/crmsh-cd.yml
new/crmsh-4.5.0+20230809.ddb17a0b/.github/workflows/crmsh-cd.yml
--- old/crmsh-4.5.0+20230725.5d35bb6c/.github/workflows/crmsh-cd.yml
1970-01-01 01:00:00.0 +0100
+++ new/crmsh-4.5.0+20230809.ddb17a0b/.github/workflows/crmsh-cd.yml
2023-08-08 23:52:16.0 +0200
@@ -0,0 +1,57 @@
+# This workflow will install Python dependencies, run tests and lint with a
single version of Python
+# For more information see:
https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+# For more information about secrets see:
https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
+
+name: crmsh CD
+
+on: push
+
+env:
+ FOLDER: /package
+ PACKAGE_NAME: crmsh
+ OBS_USER: ${{ secrets.OBS_USER }}
+ OBS_PASS: ${{ secrets.OBS_PASS }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT_CRMSH45 }}
+ TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
+
+jobs:
+ integration:
+uses: ./.github/workflows/crmsh-ci.yml
+
+ delivery:
+needs: integration
+runs-on: ubuntu-20.04
+timeout-minutes: 10
+steps:
+- uses: actions/checkout@v3
+- name: delivery process
+ if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.5' && github.event_name == 'push'
+ run: |
+docker pull shap/continuous_deliver:latest
+docker run -t -v "$(pwd):/package" \
+ -e OBS_USER=$OBS_USER \
+ -e OBS_PASS=$OBS_PASS \
+ -e FOLDER=$FOLDER \
+ -e OBS_PROJECT=$OBS_PROJECT \
+ -e PACKAGE_NAME=$PACKAGE_NAME \
+ shap/continuous_deliver \
+ /bin/bash -c "cd /package;/scripts/upload.sh"
+
+ submit:
+needs: delivery
+runs-on: ubuntu-20.04
+timeout-minutes: 10
+steps:
+- uses: actions/checkout@v3
+- name: submit process
+ if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.5' && github.event_name == 'push'
+ run: |
+docker pull shap/continuous_deliver:latest
+docker run -t -v "$(pwd):/package" \
+ -e OBS_USER=$OBS_USER \
+ -e OBS_PASS=$OBS_PASS \
+ -e OBS_PROJECT=$OBS_PROJECT \
+ -e PACKAGE_NAME=$PACKAGE_NAME \
+ -e TARGET_PROJECT=$TARGET_PROJECT \
+ shap/continuous_deliver \
+
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-07-26 13:23:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.15225 (New)
Package is "crmsh"
Wed Jul 26 13:23:53 2023 rev:303 rq:1100584 version:4.5.0+20230725.5d35bb6c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-07-13
17:19:24.129419530 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.15225/crmsh.changes 2023-07-26
13:24:56.136358746 +0200
@@ -1,0 +2,14 @@
+Tue Jul 25 09:31:23 UTC 2023 - nicholas.y...@suse.com
+
+- Update to version 4.5.0+20230725.5d35bb6c:
+ * Dev: spec: Adjust spec file for Fedora
+ * Dev: spec: Rewrite SPEC file to use modern pip+wheel and don't use
deprecated setup.py
+
+---
+Mon Jul 24 08:21:30 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230724.6495aa19:
+ * Dev: behave: add a function test for the previous change
+ * Fix: upgradeutil: support the change of path of upgrade_seq in crmsh-4.5
(bsc#1213050)
+
+---
Old:
crmsh-4.5.0+20230705.ea8c76ff.tar.bz2
New:
crmsh-4.5.0+20230725.5d35bb6c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.m29JNc/_old 2023-07-26 13:24:56.956363695 +0200
+++ /var/tmp/diff_new_pack.m29JNc/_new 2023-07-26 13:24:56.960363719 +0200
@@ -32,15 +32,11 @@
%define pkg_group Productivity/Clustering/HA
%endif
-%if %{undefined python3_sitelib}
-%global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import
get_python_lib; print(get_python_lib())")
-%endif
-
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230705.ea8c76ff
+Version:4.5.0+20230725.5d35bb6c
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -58,7 +54,8 @@
Requires: python3-PyYAML
Requires: python3-lxml
BuildRequires: python3-lxml
-BuildRequires: python3-setuptools
+BuildRequires: python3-pip
+BuildRequires: python3-wheel
%if 0%{?suse_version}
# only require csync2 on SUSE since bootstrap
@@ -74,6 +71,9 @@
BuildRequires: python3-curses
%else
Requires: python3-dateutil
+BuildRequires: pyproject-rpm-macros
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
%endif
# Required for core functionality
@@ -83,14 +83,14 @@
BuildRequires: pkgconfig
BuildRequires: python3
-%if 0%{?suse_version} > 1210
+%if 0%{?suse_version}
# xsltproc is necessary for manpage generation; this is split out into
# libxslt-tools as of openSUSE 12.2. Possibly strictly should be
# required by asciidoc
BuildRequires: libxslt-tools
%endif
-%if 0%{?suse_version} > 1110 || 0%{?fedora_version} || 0%{?centos_version} ||
0%{?rhel_version} || 0%{?rhel} || 0%{?fedora}
+%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?centos_version} ||
0%{?rhel_version} || 0%{?rhel} || 0%{?fedora}
BuildArch: noarch
%endif
@@ -114,9 +114,7 @@
%endif
Requires(post): python3-tox
Requires(post): pacemaker
-%if 0%{?suse_version} > 1110
BuildArch: noarch
-%endif
%if 0%{?suse_version}
Requires(post): libglue-devel
%else
@@ -146,8 +144,14 @@
# replace the shebang in all the scripts
# with ${_bindir}/python3
-find . -type f -exec perl -pi -e 'BEGIN{undef
$/};s[^#\!/usr/bin/python[3]?][#\!%{_bindir}/python3]' {} \;
-find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env
python[3]?][#\!%{_bindir}/python3]' {} \;
+find . -type f -exec sed -i \
+-e "s|#!/usr/bin/python3?|#!%{__python3}|" \
+-e "s|#!/usr/bin/env python3?|#!%{__python3}|" \
+{} \;
+sed -i -e '1{\@^#!%{_bindir}/python3@d}' crmsh/report/core.py
+
+# this is wrong FIXME
+sed -i -e '/data_files/d' setup.py
%build
./autogen.sh
@@ -158,7 +162,22 @@
--with-version=%{version}\
--docdir=%{crmsh_docdir}
-make %{_smp_mflags} VERSION="%{version}" sysconfdir=%{_sysconfdir}
localstatedir=%{_var}
+%if 0%{?suse_version}
+%python3_pyproject_wheel
+%else
+%generate_buildrequires
+%pyproject_buildrequires -t
+%pyproject_wheel
+%endif
+
+# Generate manpages
+for manpg in doc/crm{,sh_crm_report}.8.adoc ; do
+a2x -f manpage $manpg
+done
+
+for docad in doc/crm{,sh_crm_report}.8.adoc ; do
+asciidoc --unsafe --backend=xhtml11 $docad
+done
%if %{with regression_tests}
tox
@@ -169,14 +188,43 @@
%endif
%install
-make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
-install -Dm0644 contrib/bash_completion.sh
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-07-13 17:19:22
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.8922 (New)
Package is "crmsh"
Thu Jul 13 17:19:22 2023 rev:302 rq:1098537 version:4.5.0+20230705.ea8c76ff
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-07-06
18:28:47.527189664 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.8922/crmsh.changes2023-07-13
17:19:24.129419530 +0200
@@ -1,0 +2,6 @@
+Thu Jul 13 09:16:00 UTC 2023 - XinLiang
+
+- Dev: spec: Define python3_sitelib if it is not defined
+- Dev: spec: Update package dependency
+
+---
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.jBcEQL/_old 2023-07-13 17:19:24.933424275 +0200
+++ /var/tmp/diff_new_pack.jBcEQL/_new 2023-07-13 17:19:24.937424298 +0200
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,13 +32,17 @@
%define pkg_group Productivity/Clustering/HA
%endif
+%if %{undefined python3_sitelib}
+%global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import
get_python_lib; print(get_python_lib())")
+%endif
+
Name: crmsh
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
Version:4.5.0+20230705.ea8c76ff
Release:0
-Url:http://crmsh.github.io
+URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
Source1:%{name}.tmpfiles.d.conf
@@ -51,8 +55,8 @@
Requires: %{name}-scripts >= %{version}-%{release}
Requires: /usr/bin/which
Requires: python3 >= 3.4
+Requires: python3-PyYAML
Requires: python3-lxml
-Requires: python3-python-dateutil
BuildRequires: python3-lxml
BuildRequires: python3-setuptools
@@ -63,15 +67,13 @@
%endif
%if 0%{?suse_version}
-Requires: python3-PyYAML
# Suse splits this off into a separate package
Requires: python3-curses
+Requires: python3-python-dateutil
BuildRequires: fdupes
BuildRequires: python3-curses
-%endif
-
-%if 0%{?fedora_version}
-Requires: PyYAML
+%else
+Requires: python3-dateutil
%endif
# Required for core functionality
@@ -105,7 +107,11 @@
%if %{with regression_tests}
Requires(post): mailx
Requires(post): procps
+%if 0%{?suse_version}
Requires(post): python3-python-dateutil
+%else
+Requires(post): python3-dateutil
+%endif
Requires(post): python3-tox
Requires(post): pacemaker
%if 0%{?suse_version} > 1110
@@ -116,12 +122,8 @@
%else
Requires(post): cluster-glue-libs-devel
%endif
-%if 0%{?fedora_version}
-Requires(post): PyYAML
-%else
Requires(post): python3-PyYAML
%endif
-%endif
%description test
The crm shell is a command-line interface for High-Availability
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-07-06 18:28:43
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.23466 (New)
Package is "crmsh"
Thu Jul 6 18:28:43 2023 rev:301 rq:1096978 version:4.5.0+20230705.ea8c76ff
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-07-04
15:23:50.482732588 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.23466/crmsh.changes 2023-07-06
18:28:47.527189664 +0200
@@ -1,0 +2,7 @@
+Wed Jul 05 13:45:36 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230705.ea8c76ff:
+ * Fix: codecov: specify token explicitly
+ * Fix: ui_context: wait4dc should assume a subcommand completes successfully
if no exceptions are raised (bsc#1212992)
+
+---
Old:
crmsh-4.5.0+20230704.509d113d.tar.bz2
New:
crmsh-4.5.0+20230705.ea8c76ff.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GnEJ3L/_old 2023-07-06 18:28:50.619208647 +0200
+++ /var/tmp/diff_new_pack.GnEJ3L/_new 2023-07-06 18:28:50.623208671 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230704.509d113d
+Version:4.5.0+20230705.ea8c76ff
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.GnEJ3L/_old 2023-07-06 18:28:50.667208942 +0200
+++ /var/tmp/diff_new_pack.GnEJ3L/_new 2023-07-06 18:28:50.671208966 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- b523cac11158f4c27d6d27fc7b44c21282e9e679
+ 73c42ca0a9a6cac1cf4e5236bd9c2ea03db7e741
(No newline at EOF)
++ crmsh-4.5.0+20230704.509d113d.tar.bz2 ->
crmsh-4.5.0+20230705.ea8c76ff.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230704.509d113d/.github/workflows/crmsh-ci.yml
new/crmsh-4.5.0+20230705.ea8c76ff/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.5.0+20230704.509d113d/.github/workflows/crmsh-ci.yml
2023-07-04 08:28:16.0 +0200
+++ new/crmsh-4.5.0+20230705.ea8c76ff/.github/workflows/crmsh-ci.yml
2023-07-05 15:10:28.0 +0200
@@ -65,6 +65,8 @@
index=`$GET_INDEX_OF crm_report_bugs`
$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_bootstrap_bugs:
runs-on: ubuntu-20.04
@@ -78,6 +80,8 @@
index=`$GET_INDEX_OF bootstrap_bugs`
$DOCKER_SCRIPT $index
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_bootstrap_bugs_non_root:
runs-on: ubuntu-20.04
@@ -91,6 +95,8 @@
index=`$GET_INDEX_OF bootstrap_bugs`
$DOCKER_SCRIPT $index -u
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_bootstrap_common:
runs-on: ubuntu-20.04
@@ -104,6 +110,8 @@
index=`$GET_INDEX_OF bootstrap_init_join_remove`
$DOCKER_SCRIPT $index
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_bootstrap_common_non_root:
runs-on: ubuntu-20.04
@@ -117,6 +125,8 @@
index=`$GET_INDEX_OF bootstrap_init_join_remove`
$DOCKER_SCRIPT $index -u
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_bootstrap_options:
runs-on: ubuntu-20.04
@@ -130,6 +140,8 @@
index=`$GET_INDEX_OF bootstrap_options`
$DOCKER_SCRIPT $index
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_bootstrap_options_non_root:
runs-on: ubuntu-20.04
@@ -143,6 +155,8 @@
index=`$GET_INDEX_OF bootstrap_options`
$DOCKER_SCRIPT $index -u
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_qdevice_setup_remove:
runs-on: ubuntu-20.04
@@ -156,6 +170,8 @@
index=`$GET_INDEX_OF qdevice_setup_remove`
$DOCKER_SCRIPT $index
- uses: codecov/codecov-action@v3
+ with:
+token: ${{ secrets.CODECOV_TOKEN }}
functional_test_qdevice_setup_remove_non_root:
runs-on: ubuntu-20.04
@@ -169,6 +185,8 @@
index=`$GET_INDEX_OF qdevice_setup_remove`
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-07-04 15:22:59
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.23466 (New)
Package is "crmsh"
Tue Jul 4 15:22:59 2023 rev:300 rq:1096671 version:4.5.0+20230704.509d113d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-06-19
22:50:45.869633161 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.23466/crmsh.changes 2023-07-04
15:23:50.482732588 +0200
@@ -1,0 +2,25 @@
+Tue Jul 04 06:55:43 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230704.509d113d:
+ * Fix: unittest: fix unit tests for crmsh.bootstrap.Context.set_context
+ * Dev: codecov: do not post comment in pull requests until all behave tests
are finished
+ * Dev: testcases: update the cases to adapt to updated version of pacemaker
+ * Dev: behave: install coverage.py in docker image
+ * Dev: test_container: refactor Dockerfile for better performance
+ * Dev: github-actions: add codecov
+ * Dev: behave: add coverage to functional test
+ * Fix: upgradeutil: do not tried to upgrade when the cluster is partially
set up
+ * Dev: behave: adjust functional tests for previous changes
+ * Dev: unittest: add unit tests for bootstrap.Context.initialize_user
+ * Dev: unittest: adjust unit tests for previous changes
+ * Fix: bootstrap: fix the validation of option -N and -c (bsc#1212436)
+ * switch to the new container image
+ * Dev: behave: adjust functional test for previous changes
+ * Fix: geo_cluster: the behavior of choosing a default user in
geo_join/geo_init_arbitrator is different with `cluster join` (bsc#1211817)
+ * Fix: utils: do not use sudoer user to create ssh session unless it is
specified explicitly (bsc#1211817)
+ * Dev: behave: add a function `assert_in` to print the difference when the
assertion fails
+ * Fix: behave: specify username explicitly in non-root cases for option
--qnetd-hostname/--cluster-node
+ * Dev: behave: rewrite check_service_state with the new agent
+ * Dev: behave: use a standalone agent instead of crmsh.parallax to run
commands
+
+---
Old:
crmsh-4.5.0+20230619.01463a46.tar.bz2
New:
crmsh-4.5.0+20230704.509d113d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.0xIjzh/_old 2023-07-04 15:23:51.214736987 +0200
+++ /var/tmp/diff_new_pack.0xIjzh/_new 2023-07-04 15:23:51.218737011 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230619.01463a46
+Version:4.5.0+20230704.509d113d
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.0xIjzh/_old 2023-07-04 15:23:51.258737252 +0200
+++ /var/tmp/diff_new_pack.0xIjzh/_new 2023-07-04 15:23:51.262737275 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 87965cbe2c3b7d719172d79f93ab18254306d244
+ b523cac11158f4c27d6d27fc7b44c21282e9e679
(No newline at EOF)
++ crmsh-4.5.0+20230619.01463a46.tar.bz2 ->
crmsh-4.5.0+20230704.509d113d.tar.bz2 ++
2453 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-06-19 22:50:39
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.15902 (New)
Package is "crmsh"
Mon Jun 19 22:50:39 2023 rev:299 rq:1093731 version:4.5.0+20230619.01463a46
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-06-16
16:56:52.598426841 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.15902/crmsh.changes 2023-06-19
22:50:45.869633161 +0200
@@ -1,0 +2,6 @@
+Mon Jun 19 06:36:03 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230619.01463a46:
+ * medium: ui_node: fix cib rollback race on node standby
+
+---
Old:
crmsh-4.5.0+20230616.cf763cd1.tar.bz2
New:
crmsh-4.5.0+20230619.01463a46.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.b56m9H/_old 2023-06-19 22:50:47.485642624 +0200
+++ /var/tmp/diff_new_pack.b56m9H/_new 2023-06-19 22:50:47.493642670 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230616.cf763cd1
+Version:4.5.0+20230619.01463a46
Release:0
Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.b56m9H/_old 2023-06-19 22:50:47.549642998 +0200
+++ /var/tmp/diff_new_pack.b56m9H/_new 2023-06-19 22:50:47.553643022 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- e69c76eeac27ae8ba34a75e2baed215e26ceb224
+ 87965cbe2c3b7d719172d79f93ab18254306d244
(No newline at EOF)
++ crmsh-4.5.0+20230616.cf763cd1.tar.bz2 ->
crmsh-4.5.0+20230619.01463a46.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230616.cf763cd1/crmsh/ui_node.py
new/crmsh-4.5.0+20230619.01463a46/crmsh/ui_node.py
--- old/crmsh-4.5.0+20230616.cf763cd1/crmsh/ui_node.py 2023-06-16
10:11:36.0 +0200
+++ new/crmsh-4.5.0+20230619.01463a46/crmsh/ui_node.py 2023-06-19
08:01:11.0 +0200
@@ -3,6 +3,7 @@
# See COPYING for license information.
import re
+import copy
import subprocess
from argparse import ArgumentParser, RawDescriptionHelpFormatter
@@ -375,6 +376,24 @@
xml_query_path_oppsite = constants.XML_NODE_QUERY_STANDBY_PATH
cib = xmlutil.cibdump2elem()
+# IMPORTANT:
+# Do NOT call cibdump2elem twice, or you risk a race where the
+# resulting diff will contain more changes than the values for
+# "standby", potentially rolling back the effect of other operations.
+# Really use the same xml as "original" and basis for the changes.
+# Thus the "deepcopy" here.
+#
+# Possible optimization: instead of deepcopy here and xml_tostring
+# below and str2tmp in diff_and_patch you probably want to change
+# diff_and_patch to accept a file (as well), then
+# from . import tmpfiles
+# orig_cib_tmpfile = xmlutil.cibdump2tmp()
+# tmpfiles.add(orig_cib_tmpfile)
+# cib = xmlutil.file2cib_elem(orig_cib_tmpfile)
+# ...
+# diff_and_patch(orig_file=orig_cib_tmpfile,
new_str=xmlutil.xml_tostring(cib))
+orig_cib = copy.deepcopy(cib)
+
xml_item_list = cib.xpath(xml_path)
for xml_item in xml_item_list:
if xml_item.get("uname") in node_list:
@@ -396,7 +415,6 @@
res_item = xmlutil.get_set_nodes(interface_item,
"instance_attributes", create=True)
xmlutil.set_attr(res_item[0], "standby", "on")
-orig_cib = xmlutil.cibdump2elem()
rc = utils.diff_and_patch(xmlutil.xml_tostring(orig_cib),
xmlutil.xml_tostring(cib))
if not rc:
return False
@@ -416,6 +434,10 @@
return
cib = xmlutil.cibdump2elem()
+# IMPORTANT: Do NOT call cibdump2elem twice, or you risk a race.
+# Really use the same xml as "original" and basis for the changes.
+# Thus the "deepcopy" here; see also do_standby().
+orig_cib = copy.deepcopy(cib)
for node in node_list:
node_id = utils.get_nodeid_from_name(node)
for query_path in [constants.XML_NODE_QUERY_STANDBY_PATH,
constants.XML_STATUS_QUERY_STANDBY_PATH]:
@@ -423,7 +445,6 @@
if item and item[0].get("value") != "off":
item[0].set("value", "off")
-orig_cib = xmlutil.cibdump2elem()
rc =
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-06-16 16:55:45
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.15902 (New)
Package is "crmsh"
Fri Jun 16 16:55:45 2023 rev:298 rq:1093455 version:4.5.0+20230616.cf763cd1
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-05-25
23:52:37.847644121 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.15902/crmsh.changes 2023-06-16
16:56:52.598426841 +0200
@@ -1,0 +2,17 @@
+Fri Jun 16 08:49:12 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230616.cf763cd1:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: behave: Add functional test for previous change
+ * Dev: remove unused codes
+ * Dev: ui_cluster: Use 'CustomAppendAction' instead of 'append' argparse
action
+
+---
+Thu Jun 01 02:12:23 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230531.b167a2d7:
+ * Dev: bootstrap: Configure ssh key when fetch geo config
+ * Dev: cmd_status: Use --output-as option instead of deprecated --as-html
and --as-xml options
+ * Dev: cmd_status: Append 'with quorum' and 'WITHOUT quorum' to display
keyword list
+
+---
Old:
crmsh-4.5.0+20230517.b2cb988b.tar.bz2
New:
crmsh-4.5.0+20230616.cf763cd1.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.unp4gR/_old 2023-06-16 16:56:53.286430899 +0200
+++ /var/tmp/diff_new_pack.unp4gR/_new 2023-06-16 16:56:53.294430947 +0200
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,9 +36,9 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230517.b2cb988b
+Version:4.5.0+20230616.cf763cd1
Release:0
-URL:http://crmsh.github.io
+Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
Source1:%{name}.tmpfiles.d.conf
@@ -54,8 +54,7 @@
Requires: python3-lxml
Requires: python3-python-dateutil
BuildRequires: python3-lxml
-BuildRequires: python3-pip
-BuildRequires: python3-wheel
+BuildRequires: python3-setuptools
%if 0%{?suse_version}
# only require csync2 on SUSE since bootstrap
@@ -82,14 +81,14 @@
BuildRequires: pkgconfig
BuildRequires: python3
-%if 0%{?suse_version}
+%if 0%{?suse_version} > 1210
# xsltproc is necessary for manpage generation; this is split out into
# libxslt-tools as of openSUSE 12.2. Possibly strictly should be
# required by asciidoc
BuildRequires: libxslt-tools
%endif
-%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?centos_version} ||
0%{?rhel_version} || 0%{?rhel} || 0%{?fedora}
+%if 0%{?suse_version} > 1110 || 0%{?fedora_version} || 0%{?centos_version} ||
0%{?rhel_version} || 0%{?rhel} || 0%{?fedora}
BuildArch: noarch
%endif
@@ -109,7 +108,9 @@
Requires(post): python3-python-dateutil
Requires(post): python3-tox
Requires(post): pacemaker
+%if 0%{?suse_version} > 1110
BuildArch: noarch
+%endif
%if 0%{?suse_version}
Requires(post): libglue-devel
%else
@@ -143,14 +144,8 @@
# replace the shebang in all the scripts
# with ${_bindir}/python3
-find . -type f -exec sed -i \
--e "s|#!/usr/bin/python3?|#!%{__python3}|" \
--e "s|#!/usr/bin/env python3?|#!%{__python3}|" \
-{} \;
-sed -i -e '1{\@^#!%{_bindir}/python3@d}' crmsh/report/core.py
-
-# this is wrong FIXME
-sed -i -e '/data_files/d' setup.py
+find . -type f -exec perl -pi -e 'BEGIN{undef
$/};s[^#\!/usr/bin/python[3]?][#\!%{_bindir}/python3]' {} \;
+find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env
python[3]?][#\!%{_bindir}/python3]' {} \;
%build
./autogen.sh
@@ -161,16 +156,7 @@
--with-version=%{version}\
--docdir=%{crmsh_docdir}
-%python3_pyproject_wheel
-
-# Generate manpages
-for manpg in doc/crm{,sh_crm_report}.8.adoc ; do
-a2x -f manpage $manpg
-done
-
-for docad in doc/crm{,sh_crm_report}.8.adoc ; do
-asciidoc --unsafe --backend=xhtml11 $docad
-done
+make %{_smp_mflags} VERSION="%{version}" sysconfdir=%{_sysconfdir}
localstatedir=%{_var}
%if %{with regression_tests}
tox
@@ -181,39 +167,14 @@
%endif
%install
-# make DESTDIR=%%{buildroot} docdir=%%{crmsh_docdir} install
-%python3_pyproject_install
-
-#
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-05-25 23:52:24
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Thu May 25 23:52:24 2023 rev:297 rq:1088926 version:4.5.0+20230517.b2cb988b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-05-18
15:19:52.034053515 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-05-25
23:52:37.847644121 +0200
@@ -1,0 +2,6 @@
+Tue May 23 06:01:47 UTC 2023 - Matej Cepl
+
+- Rewrite SPEC file to use modern pip+wheel and don't use
+ deprecated setup.py.
+
+---
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.zsZvbA/_old 2023-05-25 23:52:38.423647502 +0200
+++ /var/tmp/diff_new_pack.zsZvbA/_new 2023-05-25 23:52:38.431647549 +0200
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,7 @@
Group: %{pkg_group}
Version:4.5.0+20230517.b2cb988b
Release:0
-Url:http://crmsh.github.io
+URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
Source1:%{name}.tmpfiles.d.conf
@@ -54,7 +54,8 @@
Requires: python3-lxml
Requires: python3-python-dateutil
BuildRequires: python3-lxml
-BuildRequires: python3-setuptools
+BuildRequires: python3-pip
+BuildRequires: python3-wheel
%if 0%{?suse_version}
# only require csync2 on SUSE since bootstrap
@@ -81,14 +82,14 @@
BuildRequires: pkgconfig
BuildRequires: python3
-%if 0%{?suse_version} > 1210
+%if 0%{?suse_version}
# xsltproc is necessary for manpage generation; this is split out into
# libxslt-tools as of openSUSE 12.2. Possibly strictly should be
# required by asciidoc
BuildRequires: libxslt-tools
%endif
-%if 0%{?suse_version} > 1110 || 0%{?fedora_version} || 0%{?centos_version} ||
0%{?rhel_version} || 0%{?rhel} || 0%{?fedora}
+%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?centos_version} ||
0%{?rhel_version} || 0%{?rhel} || 0%{?fedora}
BuildArch: noarch
%endif
@@ -108,9 +109,7 @@
Requires(post): python3-python-dateutil
Requires(post): python3-tox
Requires(post): pacemaker
-%if 0%{?suse_version} > 1110
BuildArch: noarch
-%endif
%if 0%{?suse_version}
Requires(post): libglue-devel
%else
@@ -144,8 +143,14 @@
# replace the shebang in all the scripts
# with ${_bindir}/python3
-find . -type f -exec perl -pi -e 'BEGIN{undef
$/};s[^#\!/usr/bin/python[3]?][#\!%{_bindir}/python3]' {} \;
-find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env
python[3]?][#\!%{_bindir}/python3]' {} \;
+find . -type f -exec sed -i \
+-e "s|#!/usr/bin/python3?|#!%{__python3}|" \
+-e "s|#!/usr/bin/env python3?|#!%{__python3}|" \
+{} \;
+sed -i -e '1{\@^#!%{_bindir}/python3@d}' crmsh/report/core.py
+
+# this is wrong FIXME
+sed -i -e '/data_files/d' setup.py
%build
./autogen.sh
@@ -156,7 +161,16 @@
--with-version=%{version}\
--docdir=%{crmsh_docdir}
-make %{_smp_mflags} VERSION="%{version}" sysconfdir=%{_sysconfdir}
localstatedir=%{_var}
+%python3_pyproject_wheel
+
+# Generate manpages
+for manpg in doc/crm{,sh_crm_report}.8.adoc ; do
+a2x -f manpage $manpg
+done
+
+for docad in doc/crm{,sh_crm_report}.8.adoc ; do
+asciidoc --unsafe --backend=xhtml11 $docad
+done
%if %{with regression_tests}
tox
@@ -167,14 +181,39 @@
%endif
%install
-make DESTDIR=%{buildroot} docdir=%{crmsh_docdir} install
-install -Dm0644 contrib/bash_completion.sh
%{buildroot}%{_datadir}/bash-completion/completions/crm
+# make DESTDIR=%%{buildroot} docdir=%%{crmsh_docdir} install
+%python3_pyproject_install
+
+# additional directories
+install -d -m0770 %{buildroot}%{_localstatedir}/cache/crm
+install -d -m0770 %{buildroot}%{_localstatedir}/log/crmsh
+install -d -m0755 %{buildroot}%{_tmpfilesdir}
+
+# install configuration
+install -Dm0644 -t %{buildroot}%{_sysconfdir}/crm etc/{crm.conf,profiles.yml}
+install -m0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
+# install manpages
+install -Dpm0644 -t %{buildroot}%{_mandir}/man8 doc/*.8
+install -Dpm0644 -t %{buildroot}%{_datadir}/crmsh/ doc/crm.8.adoc
+
+# install data
+for d in $(cat data-manifest); do
+ if [ -x $d ] ; then mode="0755" ; else mode="0644" ; fi
+ install -D -m $mode $d %{buildroot}%{_datadir}/crmsh/$d
+done
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-05-18 15:19:41
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Thu May 18 15:19:41 2023 rev:296 rq:1087718 version:4.5.0+20230517.b2cb988b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-05-15
16:54:53.700363360 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-05-18
15:19:52.034053515 +0200
@@ -1,0 +2,6 @@
+Wed May 17 14:34:05 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230517.b2cb988b:
+ * Dev: workflows: Deliver package to network:ha-clustering:Stable
+
+---
Old:
crmsh-4.5.0+20230515.64893bc7.tar.bz2
New:
crmsh-4.5.0+20230517.b2cb988b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.WGinlx/_old 2023-05-18 15:19:52.642057243 +0200
+++ /var/tmp/diff_new_pack.WGinlx/_new 2023-05-18 15:19:52.646057268 +0200
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,9 +36,9 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230515.64893bc7
+Version:4.5.0+20230517.b2cb988b
Release:0
-URL:http://crmsh.github.io
+Url:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
Source1:%{name}.tmpfiles.d.conf
++ _service ++
--- /var/tmp/diff_new_pack.WGinlx/_old 2023-05-18 15:19:52.682057489 +0200
+++ /var/tmp/diff_new_pack.WGinlx/_new 2023-05-18 15:19:52.682057489 +0200
@@ -4,7 +4,7 @@
git
crmsh
4.5.0+%cd.%h
-master
+crmsh-4.5
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.WGinlx/_old 2023-05-18 15:19:52.706057635 +0200
+++ /var/tmp/diff_new_pack.WGinlx/_new 2023-05-18 15:19:52.710057661 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 64893bc7fff6898a8bf1495e104537a9d1f14193
+ 03c1da25a4e2c9a80032e824dad72a2ffbad614a
(No newline at EOF)
++ crmsh-4.5.0+20230515.64893bc7.tar.bz2 ->
crmsh-4.5.0+20230517.b2cb988b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230515.64893bc7/.github/workflows/crmsh-ci.yml
new/crmsh-4.5.0+20230517.b2cb988b/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.5.0+20230515.64893bc7/.github/workflows/crmsh-ci.yml
2023-05-15 09:32:17.0 +0200
+++ new/crmsh-4.5.0+20230517.b2cb988b/.github/workflows/crmsh-ci.yml
2023-05-17 08:24:19.0 +0200
@@ -13,7 +13,7 @@
PACKAGE_NAME: crmsh
OBS_USER: ${{ secrets.OBS_USER }}
OBS_PASS: ${{ secrets.OBS_PASS }}
- OBS_PROJECT: ${{ secrets.OBS_PROJECT }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT_CRMSH45 }}
TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
jobs:
@@ -355,7 +355,7 @@
steps:
- uses: actions/checkout@v3
- name: delivery process
- if: github.repository == 'ClusterLabs/crmsh' && github.ref ==
'refs/heads/master' && github.event_name == 'push'
+ if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.5' && github.event_name == 'push'
run: |
docker pull shap/continuous_deliver:latest
docker run -t -v "$(pwd):/package" \
@@ -374,7 +374,7 @@
steps:
- uses: actions/checkout@v3
- name: submit process
- if: github.repository == 'ClusterLabs/crmsh' && github.ref ==
'refs/heads/master' && github.event_name == 'push'
+ if: github.repository == 'ClusterLabs/crmsh' && github.ref_name ==
'crmsh-4.5' && github.event_name == 'push'
run: |
docker pull shap/continuous_deliver:latest
docker run -t -v "$(pwd):/package" \
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-05-15 16:54:39
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Mon May 15 16:54:39 2023 rev:295 rq:1087182 version:4.5.0+20230515.64893bc7
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-05-10
17:39:28.463685456 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-05-15
16:54:53.700363360 +0200
@@ -1,0 +2,46 @@
+Mon May 15 08:08:25 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230515.64893bc7:
+ * Dev: behave: Add '@' for -N/--node option for non-root case
+ * Dev: behave: Add -q option for run-functional-tests to create qnetd-node
+ * Dev: behave: Adjust functional test cases based on previous changes
+ * Dev: behave: Create normal user that does not belong to the haclient group
+ * Dev: behave: Use 'su - ' instead of 'su '
+ * Dev: behave: Simulate Azure instance ssh environment
+ * Dev: Dockerfile: Remove python3-parallax from dockerfile
+ * Dev: spec: Remove python3-parallax from spec file
+ * Dev: behave: Add more functional test cases
+ * Dev: rsctest: Replace sys.stderr.write with logging
+
+---
+Mon May 15 02:46:07 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230515.d279a671:
+ * Dev: parallax: unused code removal, and refine docstrings
+ * Fix: utils: fix `cluster diff --checksum`
+ * Dev: ui_cluster: refine messages for `cluster run` and `cluster coy`
+ * Dev: geo: implement non-root support for geo_fetch_config()
+ * Fix: bootstrap: failed to join when the cluster is initialized with
skip_csync2
+ * Dev: prun: minor refactor and add comments
+ * Dev: unittest: adjust unit tests for previous changes
+ * Dev: prun: implement timeout
+ * Dev: prun: add an concurrency limiter
+ * Dev: remove python dependency parallax
+ * Dev: scripts: implement non-root support with crmsh.prun
+ * Dev: unused code removal
+ * Dev: implement non-root support for crm_pssh with crmsh.prun
+ * Dev: remove some direct calls to parallax module
+ * Dev: prun: add special handling for localhost
+ * Dev: refine non-root sudoer support for crmsh.parallax.parallax_slurp
+ * Dev: refine non-root sudoer support for crmsh.parallax.parallax_copy
+ * Dev: upgradeutil: adapt to new parallax interface
+ * Dev: refine non-root sudoer support for crmsh.parallax.parallax_call
(bsc#1210709)
+
+---
+Mon May 15 01:22:32 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230515.db0cbb05:
+ * Dev: unittest: adjust unit tests for previous changes
+ * Fix: bootstrap: failed to save username for localhost when initializing a
cluster with a qnet server
+
+---
Old:
crmsh-4.5.0+20230510.847a251b.tar.bz2
New:
crmsh-4.5.0+20230515.64893bc7.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.0HKfdT/_old 2023-05-15 16:54:54.320366782 +0200
+++ /var/tmp/diff_new_pack.0HKfdT/_new 2023-05-15 16:54:54.324366804 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230510.847a251b
+Version:4.5.0+20230515.64893bc7
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -52,7 +52,6 @@
Requires: /usr/bin/which
Requires: python3 >= 3.4
Requires: python3-lxml
-Requires: python3-parallax >= 1.0.8
Requires: python3-python-dateutil
BuildRequires: python3-lxml
BuildRequires: python3-setuptools
@@ -108,7 +107,6 @@
Requires(post): procps
Requires(post): python3-python-dateutil
Requires(post): python3-tox
-Requires(post): python3-parallax
Requires(post): pacemaker
%if 0%{?suse_version} > 1110
BuildArch: noarch
++ _servicedata ++
--- /var/tmp/diff_new_pack.0HKfdT/_old 2023-05-15 16:54:54.368367047 +0200
+++ /var/tmp/diff_new_pack.0HKfdT/_new 2023-05-15 16:54:54.372367069 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 877dc3ef6793ab869f31040316e80988b4e6afe0
+ 64893bc7fff6898a8bf1495e104537a9d1f14193
(No newline at EOF)
++ crmsh-4.5.0+20230510.847a251b.tar.bz2 ->
crmsh-4.5.0+20230515.64893bc7.tar.bz2 ++
2924 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-05-10 17:39:20
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Wed May 10 17:39:20 2023 rev:294 rq:1086098 version:4.5.0+20230510.847a251b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-04-27
20:00:54.141914195 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-05-10
17:39:28.463685456 +0200
@@ -1,0 +2,13 @@
+Wed May 10 09:50:09 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230510.847a251b:
+ * Fix: bootstrap: `init --qnetd-hostname` fails when username is not
specified (bsc#1211200)
+
+---
+Wed May 10 08:44:23 UTC 2023 - nicholas.y...@suse.com
+
+- Update to version 4.5.0+20230510.3343cc42:
+ * Dev: behave: Use 'su - ' instead of 'su '
+ * Dev: Dockerfile: use opensuse/leap:15.5 for current CI
+
+---
Old:
crmsh-4.5.0+20230427.11d11104.tar.bz2
New:
crmsh-4.5.0+20230510.847a251b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.XSkGAp/_old 2023-05-10 17:39:28.959688388 +0200
+++ /var/tmp/diff_new_pack.XSkGAp/_new 2023-05-10 17:39:28.963688411 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230427.11d11104
+Version:4.5.0+20230510.847a251b
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.XSkGAp/_old 2023-05-10 17:39:29.003688648 +0200
+++ /var/tmp/diff_new_pack.XSkGAp/_new 2023-05-10 17:39:29.007688672 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 03886aa3a42cdc817f65bcf88eaffc75a4d6845d
+ 877dc3ef6793ab869f31040316e80988b4e6afe0
(No newline at EOF)
++ crmsh-4.5.0+20230427.11d11104.tar.bz2 ->
crmsh-4.5.0+20230510.847a251b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230427.11d11104/Dockerfile
new/crmsh-4.5.0+20230510.847a251b/Dockerfile
--- old/crmsh-4.5.0+20230427.11d11104/Dockerfile2023-04-27
08:13:57.0 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/Dockerfile2023-05-10
11:28:42.0 +0200
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15.4
+FROM opensuse/leap:15.5
MAINTAINER Xin Liang
ARG ssh_prv_key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230427.11d11104/crmsh/bootstrap.py
new/crmsh-4.5.0+20230510.847a251b/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230427.11d11104/crmsh/bootstrap.py2023-04-27
08:13:57.0 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/crmsh/bootstrap.py2023-05-10
11:28:42.0 +0200
@@ -1626,7 +1626,10 @@
if qdevice_inst.ssh_user is not None:
# if the remote user is specified explicitly, use it
ssh_user = qdevice_inst.ssh_user
-local_user = utils.UserOfHost.instance().user_of(utils.this_node())
+try:
+local_user = utils.UserOfHost.instance().user_of(utils.this_node())
+except utils.UserOfHost.UserNotFoundError:
+local_user = ssh_user
else:
try:
# if ssh session has ready been available, use that
@@ -1634,7 +1637,10 @@
except utils.UserOfHost.UserNotFoundError:
pass
if ssh_user is None:
-local_user = userdir.get_sudoer()
+try:
+local_user = utils.UserOfHost.instance().user_of(utils.this_node())
+except utils.UserOfHost.UserNotFoundError:
+local_user = userdir.getuser()
ssh_user = local_user
# Configure ssh passwordless to qnetd if detect password is needed
if utils.check_ssh_passwd_need(local_user, ssh_user, qnetd_addr):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230427.11d11104/test/features/cluster_api.feature
new/crmsh-4.5.0+20230510.847a251b/test/features/cluster_api.feature
--- old/crmsh-4.5.0+20230427.11d11104/test/features/cluster_api.feature
2023-04-27 08:13:57.0 +0200
+++ new/crmsh-4.5.0+20230510.847a251b/test/features/cluster_api.feature
2023-05-10 11:28:42.0 +0200
@@ -21,12 +21,14 @@
@clean
Scenario: Start and stop resource by hacluster
-WhenRun "su hacluster -c 'crm resource stop d'" on "hanode1"
+WhenRun
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-04-27 20:00:36
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Thu Apr 27 20:00:36 2023 rev:293 rq:1083164 version:4.5.0+20230427.11d11104
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-04-24
22:31:53.791754332 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-04-27
20:00:54.141914195 +0200
@@ -1,0 +2,15 @@
+Thu Apr 27 06:35:41 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230427.11d11104:
+ * Dev: behave: Add @ when joining for non-root case
+ * Dev: behave: Add functional test for bsc#1210693
+
+---
+Wed Apr 26 14:28:37 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230426.b7c4b1aa:
+ * Dev: behave: Adjust functional test for previous change
+ * Dev: unittest: adjust unit tests for previous changes
+ * Fix: bootstrap: crm cluster join default behavior change in ssh key
handling (bsc#1210693)
+
+---
Old:
crmsh-4.5.0+20230424.75600b3f.tar.bz2
New:
crmsh-4.5.0+20230427.11d11104.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.qUF42E/_old 2023-04-27 20:00:54.701917487 +0200
+++ /var/tmp/diff_new_pack.qUF42E/_new 2023-04-27 20:00:54.705917510 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230424.75600b3f
+Version:4.5.0+20230427.11d11104
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.qUF42E/_old 2023-04-27 20:00:54.749917768 +0200
+++ /var/tmp/diff_new_pack.qUF42E/_new 2023-04-27 20:00:54.753917792 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 75600b3f641bdcc21b2252080700e71d17e1d03a
+ 03886aa3a42cdc817f65bcf88eaffc75a4d6845d
(No newline at EOF)
++ crmsh-4.5.0+20230424.75600b3f.tar.bz2 ->
crmsh-4.5.0+20230427.11d11104.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230424.75600b3f/crmsh/bootstrap.py
new/crmsh-4.5.0+20230427.11d11104/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230424.75600b3f/crmsh/bootstrap.py2023-04-24
10:59:23.0 +0200
+++ new/crmsh-4.5.0+20230427.11d11104/crmsh/bootstrap.py2023-04-27
08:13:57.0 +0200
@@ -187,17 +187,11 @@
else:
utils.fatal("Unsupported config: local node is using root and
remote nodes is using non-root users.")
elif users_of_specified_hosts == 'not_specified':
-if has_sudoer:
-self.current_user = sudoer
-else:
-assert userdir.getuser() == 'root'
-self.current_user = 'root'
+assert userdir.getuser() == 'root'
+self.current_user = 'root'
elif users_of_specified_hosts == 'no_hosts':
-if has_sudoer:
-self.current_user = sudoer
-else:
-assert userdir.getuser() == 'root'
-self.current_user = 'root'
+assert userdir.getuser() == 'root'
+self.current_user = 'root'
else:
raise AssertionError('Bad parameter user_of_specified_hosts:
{}'.format(users_of_specified_hosts))
@@ -872,9 +866,6 @@
# If not use -N/--nodes option
if not node_list:
-user_by_host = utils.HostUserConfig()
-user_by_host.add(local_user, utils.this_node())
-user_by_host.save_local()
return
print()
@@ -1635,22 +1626,31 @@
if qdevice_inst.ssh_user is not None:
# if the remote user is specified explicitly, use it
ssh_user = qdevice_inst.ssh_user
+local_user = utils.UserOfHost.instance().user_of(utils.this_node())
else:
try:
# if ssh session has ready been available, use that
local_user, ssh_user =
utils.UserOfHost.instance().user_pair_for_ssh(qnetd_addr)
except utils.UserOfHost.UserNotFoundError:
pass
-if local_user is None:
-local_user = userdir.get_sudoer()
-if local_user is None:
-local_user = userdir.getuser()
if ssh_user is None:
+local_user = userdir.get_sudoer()
ssh_user = local_user
# Configure ssh passwordless to qnetd if detect password is
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-04-24 22:31:45
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Mon Apr 24 22:31:45 2023 rev:292 rq:1082477 version:4.5.0+20230424.75600b3f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-04-21
14:17:52.330870211 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-04-24
22:31:53.791754332 +0200
@@ -1,0 +2,9 @@
+Mon Apr 24 09:12:24 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230424.75600b3f:
+ * Fix: help: Long time to load and parse crm.8.adoc (bsc#1210198)
+ * Dev: behave: Adjust functional test for previous change
+ * Dev: unittest: Adjust unit test for previous change
+ * Fix: lock: Join node failed to wait init node finished (bsc#1210332)
+
+---
Old:
crmsh-4.5.0+20230421.a509b8ce.tar.bz2
New:
crmsh-4.5.0+20230424.75600b3f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.5RtQtU/_old 2023-04-24 22:31:54.395757922 +0200
+++ /var/tmp/diff_new_pack.5RtQtU/_new 2023-04-24 22:31:54.399757946 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230421.a509b8ce
+Version:4.5.0+20230424.75600b3f
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.5RtQtU/_old 2023-04-24 22:31:54.467758350 +0200
+++ /var/tmp/diff_new_pack.5RtQtU/_new 2023-04-24 22:31:54.471758374 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- a509b8ce039b4f6c6070f9be5545dd04dbf979f2
+ 75600b3f641bdcc21b2252080700e71d17e1d03a
(No newline at EOF)
++ crmsh-4.5.0+20230421.a509b8ce.tar.bz2 ->
crmsh-4.5.0+20230424.75600b3f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230421.a509b8ce/crmsh/bootstrap.py
new/crmsh-4.5.0+20230424.75600b3f/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230421.a509b8ce/crmsh/bootstrap.py2023-04-21
10:23:56.0 +0200
+++ new/crmsh-4.5.0+20230424.75600b3f/crmsh/bootstrap.py2023-04-24
10:59:23.0 +0200
@@ -2393,7 +2393,7 @@
init_sbd()
init_upgradeutil()
-lock_inst = lock.Lock(mktemp(prefix="crmsh_lock_"))
+lock_inst = lock.Lock()
try:
with lock_inst.lock():
init_cluster()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230421.a509b8ce/crmsh/help.py
new/crmsh-4.5.0+20230424.75600b3f/crmsh/help.py
--- old/crmsh-4.5.0+20230421.a509b8ce/crmsh/help.py 2023-04-21
10:23:56.0 +0200
+++ new/crmsh-4.5.0+20230424.75600b3f/crmsh/help.py 2023-04-24
10:59:23.0 +0200
@@ -79,6 +79,9 @@
self.long = long_help
self.alias_for = alias_for
self.generated = generated
+self.from_cli = False
+self.level = False
+self.name = False
def is_alias(self):
return self.alias_for is not None
@@ -91,6 +94,10 @@
helpfilter = HelpFilter()
short_help = clidisplay.help_header(self.short)
+if self.from_cli and self.level and self.name:
+_, output, _ = get_stdout_stderr(f"crm {self.level} {self.name}
--help-without-redirect")
+page_string(short_help + '\n\n'+ output)
+return
long_help = self.long
if long_help:
@@ -107,6 +114,11 @@
def set_long_help(self, long_help):
self.long = long_help
+def set_long_lazy_load_source(self, level, name, from_cli):
+self.level = level
+self.name = name
+self.from_cli = from_cli
+
def __str__(self):
if self.long:
return self.short + '\n' + self.long
@@ -347,10 +359,7 @@
lvl = entry['level']
if lvl not in _COMMANDS:
_COMMANDS[lvl] = odict()
-if entry['from_cli']:
-_, help_output, _ = get_stdout_stderr("crm {} {}
--help-without-redirect".format(lvl, name))
-if help_output:
-helpobj.set_long_help(help_output.rstrip())
+helpobj.set_long_lazy_load_source(entry['level'], entry['name'],
entry['from_cli'])
_COMMANDS[lvl][name] = helpobj
def filter_line(line):
diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-04-21 14:17:43
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Fri Apr 21 14:17:43 2023 rev:291 rq:1081150 version:4.5.0+20230421.a509b8ce
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-31
21:15:43.366440273 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2023-04-21
14:17:52.330870211 +0200
@@ -1,0 +2,9 @@
+Fri Apr 21 08:47:46 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230421.a509b8ce:
+ * Dev: bootstrap: Call 'crm configure load' inside crm_configure_load
+ * Fix: cibconfig: use any existing rsc_defaults set rather than create
another one (bsc#1210614)
+ * Revert "Dev: bootstrap: Avoid duplicated setting for rsc_defaults"
+ * Dev: bootstrap: Print output for other nodes when using -N option
+
+---
Old:
crmsh-4.5.0+20230331.10398d83.tar.bz2
New:
crmsh-4.5.0+20230421.a509b8ce.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.qsAtfy/_old 2023-04-21 14:17:52.986873889 +0200
+++ /var/tmp/diff_new_pack.qsAtfy/_new 2023-04-21 14:17:52.990873912 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230331.10398d83
+Version:4.5.0+20230421.a509b8ce
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.qsAtfy/_old 2023-04-21 14:17:53.046874226 +0200
+++ /var/tmp/diff_new_pack.qsAtfy/_new 2023-04-21 14:17:53.050874248 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 10398d831004cf1420689ca7856125a1325a7239
+ a509b8ce039b4f6c6070f9be5545dd04dbf979f2
(No newline at EOF)
++ crmsh-4.5.0+20230331.10398d83.tar.bz2 ->
crmsh-4.5.0+20230421.a509b8ce.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230331.10398d83/crmsh/bootstrap.py
new/crmsh-4.5.0+20230421.a509b8ce/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230331.10398d83/crmsh/bootstrap.py2023-03-31
04:18:08.0 +0200
+++ new/crmsh-4.5.0+20230421.a509b8ce/crmsh/bootstrap.py2023-04-21
10:23:56.0 +0200
@@ -451,17 +451,15 @@
def crm_configure_load(action, configuration):
+action_types = ("update", "replace", "push")
+if action not in action_types:
+utils.fatal(f"Action type should be: {action_types}")
logger_utils.log_only_to_file("Loading crm config (%s), content is:" %
(action))
logger_utils.log_only_to_file(configuration)
-if not cib_factory.initialize():
-utils.fatal("Failed to load cluster configuration")
-set_obj = mkset_obj()
-if action == 'replace':
-cib_factory.erase()
-if not set_obj.save(configuration, remove=False, method=action):
-utils.fatal("Failed to load cluster configuration")
-if not cib_factory.commit():
-utils.fatal("Failed to commit cluster configuration")
+
+configuration_tmpfile = utils.str2tmp(configuration)
+tmpfiles.add(configuration_tmpfile)
+utils.get_stdout_or_raise_error(f"crm -F configure load {action}
{configuration_tmpfile}")
def wait_for_resource(message, resource, timeout_ms=WAIT_TIMEOUT_MS_DEFAULT):
@@ -1527,13 +1525,10 @@
logger.info("Loading initial cluster configuration")
-rsc_defaults_str = "rsc_defaults rsc-options: migration-threshold=3"
-if not xmlutil.RscState().has_rsc_stickiness():
-rsc_defaults_str += " resource-stickiness=1"
crm_configure_load("update", """property cib-bootstrap-options:
stonith-enabled=false
op_defaults op-options: timeout=600 record-pending=true
-{}
-""".format(rsc_defaults_str))
+rsc_defaults rsc-options: resource-stickiness=1 migration-threshold=3
+""")
_context.sbd_manager.configure_sbd_resource_and_properties()
@@ -2431,7 +2426,8 @@
logger.info("Adding node {} to cluster".format(node))
cmd = 'crm cluster join -y {} -c {}@{}'.format(options,
_context.current_user, utils.this_node())
logger.info("Running command on {}: {}".format(node, cmd))
-utils.get_stdout_or_raise_error(cmd, node)
+out = utils.get_stdout_or_raise_error(cmd, node)
+print(out)
def bootstrap_join(context):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-31 21:15:41
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Fri Mar 31 21:15:41 2023 rev:290 rq:1075721 version:4.5.0+20230331.10398d83
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-29
23:28:28.963868277 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-31
21:15:43.366440273 +0200
@@ -1,0 +2,27 @@
+Fri Mar 31 02:51:40 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230331.10398d83:
+ * Dev: testcase: update history testcase
+ * Dev: log_patterns: update patterns for pacemaker version 2.0+
+
+---
+Thu Mar 30 08:41:42 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230330.fd21b87d:
+ * Dev: behave: Add functional test for previous changes
+ * Dev: unittest: Add unit test for previous changes
+ * Dev: bootstrap: Support replacing sbd device via sbd stage
+
+---
+Thu Mar 30 03:30:44 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230330.c59dceee:
+ * Dev: utils: add auto_convert_role flag for handle_role_for_ocf_1_1 function
+
+---
+Thu Mar 30 02:32:29 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230330.60bfb162:
+ * Dev: ChangeLog: update ChangeLog for release 4.5.0
+
+---
Old:
crmsh-4.5.0+20230329.6d95249b.tar.bz2
New:
crmsh-4.5.0+20230331.10398d83.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.wqvxpV/_old 2023-03-31 21:15:44.010443267 +0200
+++ /var/tmp/diff_new_pack.wqvxpV/_new 2023-03-31 21:15:44.014443286 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230329.6d95249b
+Version:4.5.0+20230331.10398d83
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.wqvxpV/_old 2023-03-31 21:15:44.070443545 +0200
+++ /var/tmp/diff_new_pack.wqvxpV/_new 2023-03-31 21:15:44.074443564 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 6d95249b45798e626c6ea395dd3182d54b577219
+ 10398d831004cf1420689ca7856125a1325a7239
(No newline at EOF)
++ crmsh-4.5.0+20230329.6d95249b.tar.bz2 ->
crmsh-4.5.0+20230331.10398d83.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230329.6d95249b/ChangeLog
new/crmsh-4.5.0+20230331.10398d83/ChangeLog
--- old/crmsh-4.5.0+20230329.6d95249b/ChangeLog 2023-03-29 15:37:54.0
+0200
+++ new/crmsh-4.5.0+20230331.10398d83/ChangeLog 2023-03-31 04:18:08.0
+0200
@@ -1,3 +1,19 @@
+* Thu Mar 30 2023 Xin Liang
+- Release 4.5.0
+- Dev: bootstrap: Remove /var/lib/crm and ~/.config/crm/crm.conf when removing
node
+- Dev: bootstrap: Generate the public key on the remote if it does not exist
+- Fix: utils: qdevice initialization should user_pair_for_ssh() to get
appreciated users (crmsh#1157)
+- Fix: crm report: sustain if there are offline nodes (bsc#1209480)
+- Dev: upgradeutil: Change 'upgrade' terminology to 'configuration fix'
+- Dev: utils: Check passwordless between cluster nodes
+- Dev: Dockerfile: Update pacemaker and libqb version
+- Dev: remove 'sudo' prefix internally
+- Fix: validate ssh session when the users is determined by guessing
(bsc#1209193)
+- Dev: bootstrap: Change user shell for hacluster on remote node, in
init_ssh_impl function
+- Fix: parallax: Use 'sudo bash -c' when executing commands via sudoer
(bsc#1209192)
+- Dev: qdevice: Add more debug messages for running commands
+- Dev: log: For the log_only_to_file method, show debug log in debug mode
+
* Thu Mar 9 2023 Xin Liang
- Release 4.5.0 rc2
- Dev: version: Bump crmsh version to 4.5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230329.6d95249b/crmsh/bootstrap.py
new/crmsh-4.5.0+20230331.10398d83/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230329.6d95249b/crmsh/bootstrap.py2023-03-29
15:37:54.0 +0200
+++ new/crmsh-4.5.0+20230331.10398d83/crmsh/bootstrap.py2023-03-31
04:18:08.0 +0200
@@ -210,8 +210,8 @@
if self.stage == "sbd":
if not self.sbd_devices and not
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-29 23:28:26
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Wed Mar 29 23:28:26 2023 rev:289 rq:1075283 version:4.5.0+20230329.6d95249b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-27
18:18:10.683707462 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-29
23:28:28.963868277 +0200
@@ -1,0 +2,27 @@
+Wed Mar 29 13:58:52 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230329.6d95249b:
+ * Dev: behave: save stderr when running command on remote
+
+---
+Wed Mar 29 10:08:43 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230329.0b20d25b:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: bootstrap: Generate the public key on the remote if it does not exist
+ * Dev: behave: Add functional test for missing public key case
+
+---
+Wed Mar 29 07:35:40 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230329.34448a8c:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: bootstrap: Remove /var/lib/crm and ~/.config/crm/crm.conf when
removing node
+
+---
+Mon Mar 27 15:36:13 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230327.9a683c11:
+ * Dev: behave: Add more test cases for bug 1209193
+
+---
Old:
crmsh-4.5.0+20230327.c76ad5d5.tar.bz2
New:
crmsh-4.5.0+20230329.6d95249b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.3qLQpy/_old 2023-03-29 23:28:29.471870992 +0200
+++ /var/tmp/diff_new_pack.3qLQpy/_new 2023-03-29 23:28:29.475871013 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230327.c76ad5d5
+Version:4.5.0+20230329.6d95249b
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.3qLQpy/_old 2023-03-29 23:28:29.519871248 +0200
+++ /var/tmp/diff_new_pack.3qLQpy/_new 2023-03-29 23:28:29.523871270 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- a108bd873f627434cea01de0805f0ebdc4b63b54
+ 6d95249b45798e626c6ea395dd3182d54b577219
(No newline at EOF)
++ crmsh-4.5.0+20230327.c76ad5d5.tar.bz2 ->
crmsh-4.5.0+20230329.6d95249b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230327.c76ad5d5/crmsh/bootstrap.py
new/crmsh-4.5.0+20230329.6d95249b/crmsh/bootstrap.py
--- old/crmsh-4.5.0+20230327.c76ad5d5/crmsh/bootstrap.py2023-03-27
16:00:29.0 +0200
+++ new/crmsh-4.5.0+20230329.6d95249b/crmsh/bootstrap.py2023-03-29
15:37:54.0 +0200
@@ -142,7 +142,7 @@
self.rm_list = [SYSCONFIG_SBD, CSYNC2_CFG, corosync.conf(), CSYNC2_KEY,
COROSYNC_AUTH, "/var/lib/heartbeat/crm/*",
"/var/lib/pacemaker/cib/*",
"/var/lib/corosync/*", "/var/lib/pacemaker/pengine/*",
PCMK_REMOTE_AUTH,
-"/var/lib/csync2/*"]
+"/var/lib/csync2/*", "~/.config/crm/*"]
@classmethod
def set_context(cls, options):
@@ -1039,6 +1039,7 @@
# which breaks shell expansion used in cmd
cmd = '''
[ -f ~/.ssh/id_rsa ] || ssh-keygen -q -t rsa -f ~/.ssh/id_rsa -C "Cluster
internal on $(hostname)" -N ''
+[ -f ~/.ssh/id_rsa.pub ] || ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
'''
result = utils.su_subprocess_run(
local_sudoer,
@@ -1049,6 +1050,7 @@
)
if result.returncode != 0:
raise ValueError(codecs.decode(result.stdout, 'utf-8', 'replace'))
+
cmd = 'cat ~/.ssh/id_rsa.pub'
result = utils.su_subprocess_run(
local_sudoer,
@@ -2606,6 +2608,8 @@
else:
utils.fatal("Specified node {} is not configured in cluster! Unable to
remove.".format(_context.cluster_node))
+# In case any crm command can re-generate upgrade_seq again
+utils.get_stdout_or_raise_error("rm -rf /var/lib/crmsh",
_context.cluster_node)
bootstrap_finished()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230327.c76ad5d5/test/features/bootstrap_bugs.feature
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-27 18:18:02
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Mon Mar 27 18:18:02 2023 rev:288 rq:1074728 version:4.5.0+20230327.c76ad5d5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-22
22:32:36.478786759 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-27
18:18:10.683707462 +0200
@@ -1,0 +2,34 @@
+Mon Mar 27 14:44:52 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230327.c76ad5d5:
+ * Fix: unittest: Adjust unit tests for previous changes
+ * Fix: utils: qdevice initialization should user_pair_for_ssh() to get
appreciated users (crmsh#1157)
+
+---
+Mon Mar 27 09:44:27 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230327.3cbdd737:
+ * Dev: behave: Change docker image as liangxin1300/haleap:15.5
+ * Fix: crm report: sustain if there are offline nodes (bsc#1209480)
+
+---
+Mon Mar 27 03:50:25 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230327.1d3873bd:
+ * Dev: behave: Add Scenario: Do upgrade job without root passwordless
+ * Dev: unittest: Add unit test case for previous changes
+ * Dev: upgradeutil: Change 'upgrade' terminology to 'configuration fix'
+ * Dev: behave: Reuse crmsh.utils.check_passwordless_between_nodes function
+ * Dev: utils: Check passwordless between cluster nodes
+
+---
+Thu Mar 23 14:46:37 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230323.9f3f56c1:
+ * Dev: behave: Adjust sbd functional test based on previous changes
+ * Dev: testcases: Adjust testcases after pacemaker upgrade
+ * Dev: workflows: split functional_test_resource_subcommand as two jobs
+ * Revert "Dev: workflows: Disable resource_failcount.feature temporarily"
+ * Dev: Dockerfile: Update pacemaker and libqb version
+
+---
Old:
crmsh-4.5.0+20230321.97bd51bb.tar.bz2
New:
crmsh-4.5.0+20230327.c76ad5d5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.b4q7vi/_old 2023-03-27 18:18:11.179710079 +0200
+++ /var/tmp/diff_new_pack.b4q7vi/_new 2023-03-27 18:18:11.183710101 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230321.97bd51bb
+Version:4.5.0+20230327.c76ad5d5
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.b4q7vi/_old 2023-03-27 18:18:11.227710332 +0200
+++ /var/tmp/diff_new_pack.b4q7vi/_new 2023-03-27 18:18:11.231710354 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- e751cc863b8189ee541fd84a72bf1584d163ffcf
+ a108bd873f627434cea01de0805f0ebdc4b63b54
(No newline at EOF)
++ crmsh-4.5.0+20230321.97bd51bb.tar.bz2 ->
crmsh-4.5.0+20230327.c76ad5d5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230321.97bd51bb/.github/workflows/crmsh-ci.yml
new/crmsh-4.5.0+20230327.c76ad5d5/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.5.0+20230321.97bd51bb/.github/workflows/crmsh-ci.yml
2023-03-21 16:02:58.0 +0100
+++ new/crmsh-4.5.0+20230327.c76ad5d5/.github/workflows/crmsh-ci.yml
2023-03-27 16:00:29.0 +0200
@@ -122,7 +122,19 @@
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
index=`$GET_INDEX_OF bootstrap_options`
-$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
+$DOCKER_SCRIPT $index
+
+ functional_test_bootstrap_options_non_root:
+runs-on: ubuntu-20.04
+timeout-minutes: 40
+steps:
+- uses: actions/checkout@v3
+- name: functional test for bootstrap options, under non root user
+ run: |
+echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
+sudo systemctl restart docker.service
+index=`$GET_INDEX_OF bootstrap_options`
+$DOCKER_SCRIPT $index -u
functional_test_qdevice_setup_remove:
runs-on: ubuntu-20.04
@@ -170,7 +182,19 @@
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-22 22:31:48
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Wed Mar 22 22:31:48 2023 rev:287 rq:1073807 version:4.5.0+20230321.97bd51bb
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-21
17:42:57.870242491 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-22
22:32:36.478786759 +0100
@@ -1,0 +2,18 @@
+Tue Mar 21 15:30:12 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230321.97bd51bb:
+ * Dev: behave: Split the time cost case into two cases
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: remove 'sudo' prefix internally
+
+---
+Tue Mar 21 13:34:38 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230321.eda6d2d9:
+ * Dev: workflows: Disable resource_failcount.feature temporarily
+ * Dev: behave: Add test case for 'Passwordless for root, not for
sudoer(bsc#1209193)'
+ * Dev: behave: check user shell after init and join, without upgrading
+ * Dev: bootstrap: Change user shell for hacluster on remote node, in
init_ssh_impl function
+ * Dev: behave: Add functional test to check user shell for hacluster
+
+---
Old:
crmsh-4.5.0+20230320.5e777809.tar.bz2
New:
crmsh-4.5.0+20230321.97bd51bb.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.aSrJAW/_old 2023-03-22 22:32:36.982789295 +0100
+++ /var/tmp/diff_new_pack.aSrJAW/_new 2023-03-22 22:32:36.986789315 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230320.5e777809
+Version:4.5.0+20230321.97bd51bb
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.aSrJAW/_old 2023-03-22 22:32:37.030789536 +0100
+++ /var/tmp/diff_new_pack.aSrJAW/_new 2023-03-22 22:32:37.030789536 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 4697fb58457de1acf83640116e145612d97e593f
+ e751cc863b8189ee541fd84a72bf1584d163ffcf
(No newline at EOF)
++ crmsh-4.5.0+20230320.5e777809.tar.bz2 ->
crmsh-4.5.0+20230321.97bd51bb.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.5.0+20230320.5e777809/.github/workflows/crmsh-ci.yml
new/crmsh-4.5.0+20230321.97bd51bb/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.5.0+20230320.5e777809/.github/workflows/crmsh-ci.yml
2023-03-20 08:49:02.0 +0100
+++ new/crmsh-4.5.0+20230321.97bd51bb/.github/workflows/crmsh-ci.yml
2023-03-21 16:02:58.0 +0100
@@ -74,7 +74,19 @@
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
index=`$GET_INDEX_OF bootstrap_bugs`
-$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
+$DOCKER_SCRIPT $index
+
+ functional_test_bootstrap_bugs_non_root:
+runs-on: ubuntu-20.04
+timeout-minutes: 40
+steps:
+- uses: actions/checkout@v3
+- name: functional test for bootstrap bugs, under non root user
+ run: |
+echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
+sudo systemctl restart docker.service
+index=`$GET_INDEX_OF bootstrap_bugs`
+$DOCKER_SCRIPT $index -u
functional_test_bootstrap_common:
runs-on: ubuntu-20.04
@@ -86,7 +98,19 @@
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
index=`$GET_INDEX_OF bootstrap_init_join_remove`
-$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
+$DOCKER_SCRIPT $index
+
+ functional_test_bootstrap_common_non_root:
+runs-on: ubuntu-20.04
+timeout-minutes: 40
+steps:
+- uses: actions/checkout@v3
+- name: functional test for bootstrap common, under non root user
+ run: |
+echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
+sudo systemctl restart docker.service
+index=`$GET_INDEX_OF bootstrap_init_join_remove`
+$DOCKER_SCRIPT $index -u
functional_test_bootstrap_options:
runs-on: ubuntu-20.04
@@ -110,7 +134,19 @@
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-21 17:41:18
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Tue Mar 21 17:41:18 2023 rev:286 rq:1073057 version:4.5.0+20230320.5e777809
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-09
17:46:52.759271772 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-21
17:41:22.765787616 +0100
@@ -1,0 +2,16 @@
+Mon Mar 20 08:53:40 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230320.5e777809:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: validate ssh session when the users is determined by guessing
(bsc#1209193)
+
+---
+Tue Mar 14 06:42:32 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230314.c7422396:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: parallax: Use 'sudo bash -c' when executing commands via sudoer
(bsc#1209192)
+ * Dev: qdevice: Add more debug messages for running commands
+ * Dev: log: For the log_only_to_file method, show debug log in debug mode
+
+---
Old:
crmsh-4.5.0+20230309.a4c4192d.tar.bz2
New:
crmsh-4.5.0+20230320.5e777809.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ucqFnk/_old 2023-03-21 17:41:23.509791175 +0100
+++ /var/tmp/diff_new_pack.ucqFnk/_new 2023-03-21 17:41:23.513791194 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.5.0+20230309.a4c4192d
+Version:4.5.0+20230320.5e777809
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ucqFnk/_old 2023-03-21 17:41:23.593791577 +0100
+++ /var/tmp/diff_new_pack.ucqFnk/_new 2023-03-21 17:41:23.597791596 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 1615c26abe860045bf4e15442899e992cc29455c
+ 4697fb58457de1acf83640116e145612d97e593f
(No newline at EOF)
++ crmsh-4.5.0+20230309.a4c4192d.tar.bz2 ->
crmsh-4.5.0+20230320.5e777809.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230309.a4c4192d/crmsh/corosync.py
new/crmsh-4.5.0+20230320.5e777809/crmsh/corosync.py
--- old/crmsh-4.5.0+20230309.a4c4192d/crmsh/corosync.py 2023-03-09
10:55:42.0 +0100
+++ new/crmsh-4.5.0+20230320.5e777809/crmsh/corosync.py 2023-03-20
08:49:02.0 +0100
@@ -107,11 +107,7 @@
raise ValueError("host for qnetd not configured!")
# Configure ssh passwordless to qnetd if detect password is needed
-local_user = utils.user_of(utils.this_node())
-try:
-remote_user = utils.user_of(qnetd_addr)
-except ValueError:
-remote_user = 'root'
+local_user, remote_user = utils.user_pair_for_ssh(qnetd_addr)
if utils.check_ssh_passwd_need(local_user, remote_user, qnetd_addr):
utils.ssh_copy_id(local_user, remote_user, qnetd_addr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230309.a4c4192d/crmsh/healthcheck.py
new/crmsh-4.5.0+20230320.5e777809/crmsh/healthcheck.py
--- old/crmsh-4.5.0+20230309.a4c4192d/crmsh/healthcheck.py 2023-03-09
10:55:42.0 +0100
+++ new/crmsh-4.5.0+20230320.5e777809/crmsh/healthcheck.py 2023-03-20
08:49:02.0 +0100
@@ -145,8 +145,8 @@
remote_nodes = set(nodes)
remote_nodes.remove(local_node)
remote_nodes = list(remote_nodes)
-local_user = crmsh.utils.user_of(local_node)
-remote_users = [crmsh.utils.user_of(node) for node in remote_nodes]
+local_user = crmsh.utils.user_pair_for_ssh(remote_nodes[0])[0]
+remote_users = [crmsh.utils.user_pair_for_ssh(node)[1] for node in
remote_nodes]
crmsh.bootstrap.init_ssh_impl(local_user, remote_nodes, remote_users)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.5.0+20230309.a4c4192d/crmsh/log.py
new/crmsh-4.5.0+20230320.5e777809/crmsh/log.py
--- old/crmsh-4.5.0+20230309.a4c4192d/crmsh/log.py 2023-03-09
10:55:42.0 +0100
+++ new/crmsh-4.5.0+20230320.5e777809/crmsh/log.py 2023-03-20
08:49:02.0 +0100
@@ -273,8 +273,12 @@
self.logger.addHandler(console_handler)
def log_only_to_file(self, msg,
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-09 17:46:51
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Thu Mar 9 17:46:51 2023 rev:285 rq:1070389 version:4.5.0+20230309.a4c4192d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-07
16:50:53.389759978 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-09
17:46:52.759271772 +0100
@@ -1,0 +2,16 @@
+Thu Mar 09 10:28:49 UTC 2023 - xli...@suse.com
+
+- Update to version 4.5.0+20230309.a4c4192d:
+ * Dev: ChangeLog: update ChangeLog for release 4.5.0-rc2
+ * Dev: version: Bump crmsh version to 4.5.0
+
+---
+Thu Mar 09 08:27:30 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230309.e15745c6:
+ * Dev: bootstrap: remove unused codes
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: bootstrap: Swap hacluster ssh key with other nodes
+ * Dev: behave: Check passwordless for hacluster between cluster nodes
+
+---
Old:
crmsh-4.4.1+20230307.daea9d13.tar.bz2
New:
crmsh-4.5.0+20230309.a4c4192d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Fx3W5a/_old 2023-03-09 17:46:53.423275306 +0100
+++ /var/tmp/diff_new_pack.Fx3W5a/_new 2023-03-09 17:46:53.427275328 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230307.daea9d13
+Version:4.5.0+20230309.a4c4192d
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.Fx3W5a/_old 2023-03-09 17:46:53.459275498 +0100
+++ /var/tmp/diff_new_pack.Fx3W5a/_new 2023-03-09 17:46:53.463275520 +0100
@@ -3,7 +3,7 @@
https://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.4.1+%cd.%h
+4.5.0+%cd.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.Fx3W5a/_old 2023-03-09 17:46:53.483275626 +0100
+++ /var/tmp/diff_new_pack.Fx3W5a/_new 2023-03-09 17:46:53.487275648 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 3b0a582ed4f2b9de2e74d86bfdd6bf7e2ca44511
+ 1615c26abe860045bf4e15442899e992cc29455c
(No newline at EOF)
++ crmsh-4.4.1+20230307.daea9d13.tar.bz2 ->
crmsh-4.5.0+20230309.a4c4192d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230307.daea9d13/ChangeLog
new/crmsh-4.5.0+20230309.a4c4192d/ChangeLog
--- old/crmsh-4.4.1+20230307.daea9d13/ChangeLog 2023-03-07 02:41:16.0
+0100
+++ new/crmsh-4.5.0+20230309.a4c4192d/ChangeLog 2023-03-09 10:55:42.0
+0100
@@ -1,3 +1,11 @@
+* Thu Mar 9 2023 Xin Liang
+- Release 4.5.0 rc2
+- Dev: version: Bump crmsh version to 4.5.0
+- Fix: bootstrap: Swap hacluster ssh key with other nodes
+- Fix: report: Fix crm report issue under non-root user
+- Fix: bootstrap: Don't save core.debug when saving core.hosts (bsc#1208991)
+- Dev: log: Redirect debug messages into stderr
+
* Fri Mar 3 2023 Xin Liang
- Release 4.5.0 rc1
- Fix: qdevice: Unable to setup qdevice under non-root user (bsc#1208770)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230307.daea9d13/configure.ac
new/crmsh-4.5.0+20230309.a4c4192d/configure.ac
--- old/crmsh-4.4.1+20230307.daea9d13/configure.ac 2023-03-07
02:41:16.0 +0100
+++ new/crmsh-4.5.0+20230309.a4c4192d/configure.ac 2023-03-09
10:55:42.0 +0100
@@ -8,7 +8,7 @@
AC_PREREQ([2.53])
-AC_INIT([crmsh],[4.4.0],[us...@clusterlabs.org])
+AC_INIT([crmsh],[4.5.0],[us...@clusterlabs.org])
AC_ARG_WITH(version,
[ --with-version=version Override package version (if you're a packager
needing to pretend) ],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230307.daea9d13/crmsh/bootstrap.py
new/crmsh-4.5.0+20230309.a4c4192d/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20230307.daea9d13/crmsh/bootstrap.py2023-03-07
02:41:16.0 +0100
+++ new/crmsh-4.5.0+20230309.a4c4192d/crmsh/bootstrap.py2023-03-09
10:55:42.0 +0100
@@ -864,7 +864,6 @@
for node in _context.node_list:
if utils.service_is_active("pacemaker.service", remote_addr=node):
utils.fatal("Cluster is currently active on {} - can't
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-07 16:50:27
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Tue Mar 7 16:50:27 2023 rev:284 rq:1069777 version:4.4.1+20230307.daea9d13
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-06
18:56:27.848944154 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-07
16:50:53.389759978 +0100
@@ -1,0 +2,6 @@
+Tue Mar 07 02:12:59 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230307.daea9d13:
+ * Fix: report: Fix crm report issue under non-root user
+
+---
Old:
crmsh-4.4.1+20230306.0f04eb29.tar.bz2
New:
crmsh-4.4.1+20230307.daea9d13.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ZYkHDx/_old 2023-03-07 16:50:54.521765947 +0100
+++ /var/tmp/diff_new_pack.ZYkHDx/_new 2023-03-07 16:50:54.525765968 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230306.0f04eb29
+Version:4.4.1+20230307.daea9d13
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ZYkHDx/_old 2023-03-07 16:50:54.577766242 +0100
+++ /var/tmp/diff_new_pack.ZYkHDx/_new 2023-03-07 16:50:54.577766242 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 1ea4e0874c84a6a5d03ee88465144ee72b81fe34
+ 3b0a582ed4f2b9de2e74d86bfdd6bf7e2ca44511
(No newline at EOF)
++ crmsh-4.4.1+20230306.0f04eb29.tar.bz2 ->
crmsh-4.4.1+20230307.daea9d13.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20230306.0f04eb29/crmsh/report/constants.py
new/crmsh-4.4.1+20230307.daea9d13/crmsh/report/constants.py
--- old/crmsh-4.4.1+20230306.0f04eb29/crmsh/report/constants.py 2023-03-06
06:03:06.0 +0100
+++ new/crmsh-4.4.1+20230307.daea9d13/crmsh/report/constants.py 2023-03-07
02:41:16.0 +0100
@@ -50,7 +50,7 @@
SLAVE = 0
SLAVEPIDS = None
SSH_OPTS = "-o StrictHostKeyChecking=no -o EscapeChar=none -o
ConnectTimeout=15"
-SSH_PASSWORD_NODES = ""
+SSH_PASSWORD_NODES = []
SSH_USER = ""
SUDO = ""
THIS_IS_NODE = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230306.0f04eb29/crmsh/report/core.py
new/crmsh-4.4.1+20230307.daea9d13/crmsh/report/core.py
--- old/crmsh-4.4.1+20230306.0f04eb29/crmsh/report/core.py 2023-03-06
06:03:06.0 +0100
+++ new/crmsh-4.4.1+20230307.daea9d13/crmsh/report/core.py 2023-03-07
02:41:16.0 +0100
@@ -24,7 +24,7 @@
"""
process_list = []
for node in nodes.split():
-if utillib.node_needs_pwd(node):
+if node in constants.SSH_PASSWORD_NODES:
logger.info("Please provide password for %s at %s",
utillib.say_ssh_user(), node)
logger.info("Note that collecting data will take a while.")
utillib.start_slave_collector(node, arg_str)
@@ -267,17 +267,6 @@
# if the ssh user was supplied, consider that it
# works; helps reduce the number of ssh invocations
utillib.find_ssh_user()
-if constants.SSH_USER:
-constants.SSH_OPTS += " -o User=%s" % constants.SSH_USER
-# assume that only root can collect data
-if ((not constants.SSH_USER) and (os.getuid() not in [0, 90])) or \
- constants.SSH_USER and constants.SSH_USER not in ["root",
"hacluster"] or \
- userdir.get_sudoer():
-logger.debug("ssh user other than root, use sudo")
-constants.SUDO = "sudo"
-if os.getuid() != 0:
-logger.debug("local user other than root, use sudo")
-constants.LOCAL_SUDO = "sudo -u root"
#
# find the logs and cut out the segment for the period
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20230306.0f04eb29/crmsh/report/utillib.py
new/crmsh-4.4.1+20230307.daea9d13/crmsh/report/utillib.py
--- old/crmsh-4.4.1+20230306.0f04eb29/crmsh/report/utillib.py 2023-03-06
06:03:06.0 +0100
+++ new/crmsh-4.4.1+20230307.daea9d13/crmsh/report/utillib.py 2023-03-07
02:41:16.0 +0100
@@ -321,7 +321,7 @@
if dump_logset(l, constants.FROM_TIME, constants.TO_TIME, outf):
log_size(l,
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-06 18:56:23
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Mon Mar 6 18:56:23 2023 rev:283 rq:1069564 version:4.4.1+20230306.0f04eb29
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-03-02
23:04:29.864151935 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-06
18:56:27.848944154 +0100
@@ -1,0 +2,15 @@
+Mon Mar 06 05:37:55 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230306.0f04eb29:
+ * Dev: bootstrap: Don't save core.debug when saving core.hosts
+ * Dev: behave: Adjust functional test for previous changes
+ * Dev: log: Redirect debug messages into stderr
+
+---
+Fri Mar 03 04:14:46 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230303.0df99d8c:
+ * Dev: ChangeLog: update ChangeLog for release 4.5.0-rc1
+ * replace 2&>1 by 2>&1 and swap with >/dev/null
+
+---
Old:
crmsh-4.4.1+20230302.2b5310b9.tar.bz2
New:
crmsh-4.4.1+20230306.0f04eb29.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.GagOd9/_old 2023-03-06 18:56:28.604948011 +0100
+++ /var/tmp/diff_new_pack.GagOd9/_new 2023-03-06 18:56:28.608948032 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230302.2b5310b9
+Version:4.4.1+20230306.0f04eb29
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.GagOd9/_old 2023-03-06 18:56:28.656948277 +0100
+++ /var/tmp/diff_new_pack.GagOd9/_new 2023-03-06 18:56:28.660948298 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- e2961b896d4155fb6205fe9f6c628a572ae61f93
+ 1ea4e0874c84a6a5d03ee88465144ee72b81fe34
(No newline at EOF)
++ crmsh-4.4.1+20230302.2b5310b9.tar.bz2 ->
crmsh-4.4.1+20230306.0f04eb29.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230302.2b5310b9/ChangeLog
new/crmsh-4.4.1+20230306.0f04eb29/ChangeLog
--- old/crmsh-4.4.1+20230302.2b5310b9/ChangeLog 2023-03-02 07:05:25.0
+0100
+++ new/crmsh-4.4.1+20230306.0f04eb29/ChangeLog 2023-03-06 06:03:06.0
+0100
@@ -1,3 +1,56 @@
+* Fri Mar 3 2023 Xin Liang
+- Release 4.5.0 rc1
+- Fix: qdevice: Unable to setup qdevice under non-root user (bsc#1208770)
+- Dev: upgradeutil: do upgrade silently (bsc#1208327)
+- Fix: bootstrap: `crm cluster join ssh` raises TypeError (bsc#1208327)
+- Dev: utils: Change the way to get pacemaker's version (bsc#1208216)
+- Dev: bootstrap: guess and ask whether to operate in non-root mode
(jsc#PED-290)
+- Dev: bootstrap: allow the cluster to operate with ssh session under non-root
sudoer (jsc#PED-290)
+- Fix: hawk fails to parse the slash (bsc#1206217)
+- Fix: extra logs while configuring passwordless (bsc#1207720)
+- Dev: utils: Check current user's privilege and give hints to user
+- Dev: ui_configure: Deprecate configure erase sub-command
+- Fix: report: Catch read exception (bsc#1206606)
+- Feature: replace root by a custom user with root privileges
+- Fix: bootstrap: Unset SBD_DELAY_START when running 'crm cluster start'
(bsc#1202177)
+- Dev: ui_node: redirect `node delete` to `cluster remove`
+- Feature: bootstrap: Add option -x to skip csync2 initialization stage during
the whole cluster bootstrap
+- Dev: parse: complete advised operation values for other actions beside
monitor
+- Dev: ui_context: redirect `foo -h`/`foo --help` to `help foo` (bsc#1205735)
+- Fix: qdevice: Adjust SBD_WATCHDOG_TIMEOUT when configuring qdevice not using
stage (bsc#1205727)
+- Fix: cibconfig: Complete promotable=true and interlave=true for
Promoted/Unpromoted resource (bsc#1205522)
+- Fix: corosync: show corosync ring status if has fault (bsc#1205615)
+- Dev: bootstrap: fix passwordless ssh authentication for hacluster
automatically when a new node is joining the cluster (bsc#1201785)
+- Dev: upgradeutil: automated init ssh passwordless auth for hacluster after
upgrading (bsc#1201785)
+- Dev: parse: cli_to_xml: populate advised monitor/start/stop operations values
+- fix: log: fail to open log file even if user is in haclient group
(bsc#1204670)
+- Fix: sbd: Ask if overwrite when given sbd device on interactive
mode(bsc#1201428)
+- Dev: bootstrap: Adjust
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-03-02 23:04:05
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Thu Mar 2 23:04:05 2023 rev:282 rq:1068615 version:4.4.1+20230302.2b5310b9
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-02-24
18:08:27.793532494 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-03-02
23:04:29.864151935 +0100
@@ -1,0 +2,34 @@
+Thu Mar 02 06:37:38 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230302.2b5310b9:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: bootstrap: Add sudo before crm_node under non-root user on remote node
+
+---
+Thu Mar 02 02:23:26 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230302.fc282490:
+ * Dev: behave: Create user alice on qnetd node
+ * Dev: behave: don't build crmsh code on qnetd node
+
+---
+Thu Mar 02 01:36:34 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230302.2ed0ab14:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: qdevice: Unable to setup qdevice under non-root user (bsc#1208770)
+
+---
+Tue Feb 28 10:07:22 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230228.2f852310:
+ * Dev: utils: Suppress the output of ssh-copy-id for non-root user case
+
+---
+Mon Feb 27 01:58:59 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230227.b420cbf5:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: utils: Avoid using magic number
+
+---
Old:
crmsh-4.4.1+20230224.498677ab.tar.bz2
New:
crmsh-4.4.1+20230302.2b5310b9.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.WYsAMV/_old 2023-03-02 23:04:30.856156890 +0100
+++ /var/tmp/diff_new_pack.WYsAMV/_new 2023-03-02 23:04:30.860156911 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230224.498677ab
+Version:4.4.1+20230302.2b5310b9
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.WYsAMV/_old 2023-03-02 23:04:30.916157190 +0100
+++ /var/tmp/diff_new_pack.WYsAMV/_new 2023-03-02 23:04:30.920157210 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 498677abb1bf88b1490339d307e925742854080b
+ e2961b896d4155fb6205fe9f6c628a572ae61f93
(No newline at EOF)
++ crmsh-4.4.1+20230224.498677ab.tar.bz2 ->
crmsh-4.4.1+20230302.2b5310b9.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230224.498677ab/crmsh/bootstrap.py
new/crmsh-4.4.1+20230302.2b5310b9/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20230224.498677ab/crmsh/bootstrap.py2023-02-24
10:04:38.0 +0100
+++ new/crmsh-4.4.1+20230302.2b5310b9/crmsh/bootstrap.py2023-03-02
07:05:25.0 +0100
@@ -157,12 +157,20 @@
"""
if not self.qnetd_addr:
return
+parts = self.qnetd_addr.split('@', 2)
+if len(parts) == 2:
+ssh_user = parts[0]
+qnetd_host = parts[1]
+else:
+ssh_user = None
+qnetd_host = self.qnetd_addr
self.qdevice_inst = qdevice.QDevice(
-self.qnetd_addr,
+qnetd_host,
port=self.qdevice_port,
algo=self.qdevice_algo,
tie_breaker=self.qdevice_tie_breaker,
tls=self.qdevice_tls,
+ssh_user=ssh_user,
cmds=self.qdevice_heuristics,
mode=self.qdevice_heuristics_mode,
is_stage=self.stage == "qdevice")
@@ -867,7 +875,9 @@
# If not use -N/--nodes option
if not node_list:
-_save_core_hosts([local_user], [utils.this_node()],
sync_to_remote=False)
+user_by_host = utils.HostUserConfig()
+user_by_host.add(local_user, utils.this_node())
+user_by_host.save_local()
return
print()
@@ -903,14 +913,11 @@
)
if result.returncode != 0:
utils.fatal('Failed to add public keys to {}@{}:
{}'.format(remote_user,
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-02-24 18:08:19
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31432 (New)
Package is "crmsh"
Fri Feb 24 18:08:19 2023 rev:281 rq:1067567 version:4.4.1+20230224.498677ab
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-02-21
15:36:34.648471625 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31432/crmsh.changes 2023-02-24
18:08:27.793532494 +0100
@@ -1,0 +2,16 @@
+Fri Feb 24 09:36:48 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230224.498677ab:
+ * Dev: utils: Suppress the output of ssh-copy-id
+
+---
+Fri Feb 24 02:32:31 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230224.83dcde63:
+ * Dev: unittest: remove test_healthcheck.py since the new implementation is
trivial
+ * Fix: bootstrap: fail to join a cluster initialized by previous version
+ * Dev: healthcheck: refine the implementation to fix ssh key problems by
calling function init_ssh instead of calling command `cluster init ssh`
+ * Dev: upgradeutil: do upgrade silently (bsc#1208327)
+ * Fix: bootstrap: `crm cluster join ssh` raises TypeError (bsc#1208327)
+
+---
Old:
crmsh-4.4.1+20230221.eb38cb6e.tar.bz2
New:
crmsh-4.4.1+20230224.498677ab.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.l4rkzU/_old 2023-02-24 18:08:28.557537047 +0100
+++ /var/tmp/diff_new_pack.l4rkzU/_new 2023-02-24 18:08:28.561537071 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230221.eb38cb6e
+Version:4.4.1+20230224.498677ab
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.l4rkzU/_old 2023-02-24 18:08:28.617537405 +0100
+++ /var/tmp/diff_new_pack.l4rkzU/_new 2023-02-24 18:08:28.621537429 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 61f8d99e061ce5bed9285b846e9494e556a7763c
+ 498677abb1bf88b1490339d307e925742854080b
(No newline at EOF)
++ crmsh-4.4.1+20230221.eb38cb6e.tar.bz2 ->
crmsh-4.4.1+20230224.498677ab.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230221.eb38cb6e/crmsh/bootstrap.py
new/crmsh-4.4.1+20230224.498677ab/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20230221.eb38cb6e/crmsh/bootstrap.py2023-02-21
03:39:22.0 +0100
+++ new/crmsh-4.4.1+20230224.498677ab/crmsh/bootstrap.py2023-02-24
10:04:38.0 +0100
@@ -851,33 +851,40 @@
def init_ssh():
-"""
-Configure passwordless SSH.
-"""
+init_ssh_impl(_context.current_user, _context.node_list,
_context.user_list)
+if _context.node_list:
+for node in _context.node_list:
+if utils.service_is_active("pacemaker.service", remote_addr=node):
+utils.fatal("Cluster is currently active on {} - can't
run".format(node))
+print()
+
+
+def init_ssh_impl(local_user: str, node_list: typing.List[str], user_list:
typing.List[str]):
+""" Configure passwordless SSH."""
utils.start_service("sshd.service", enable=True)
-local_user = _context.current_user
configure_ssh_key(local_user)
configure_ssh_key('hacluster')
# If not use -N/--nodes option
-if not _context.node_list:
-_save_core_hosts([_context.current_user], [utils.this_node()],
sync_to_remote=False)
+if not node_list:
+_save_core_hosts([local_user], [utils.this_node()],
sync_to_remote=False)
return
print()
-node_list = _context.node_list
# Swap public ssh key between remote node and local
public_key_list = list()
+hacluster_public_key_list = list()
for i, node in enumerate(node_list):
-remote_user = _context.user_list[i]
+remote_user = user_list[i]
utils.ssh_copy_id(local_user, remote_user, node)
# After this, login to remote_node is passwordless
-public_key = swap_public_ssh_key(node, local_user, remote_user,
local_user, remote_user, add=True)
-public_key_list.append(public_key)
+public_key_list.append(swap_public_ssh_key(node, local_user,
remote_user, local_user, remote_user, add=True))
+hacluster_public_key_list.append(swap_public_ssh_key(node,
'hacluster', 'hacluster', local_user, remote_user, add=True))
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-02-21 15:36:22
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.22824 (New)
Package is "crmsh"
Tue Feb 21 15:36:22 2023 rev:280 rq:1066897 version:4.4.1+20230221.eb38cb6e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-02-17
16:46:01.311206218 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.22824/crmsh.changes 2023-02-21
15:36:34.648471625 +0100
@@ -1,0 +2,6 @@
+Tue Feb 21 03:11:17 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230221.eb38cb6e:
+ * Dev: utils: Change the way to get pacemaker's version (bsc#1208216)
+
+---
Old:
crmsh-4.4.1+20230217.7fe11a5c.tar.bz2
New:
crmsh-4.4.1+20230221.eb38cb6e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ZJawzP/_old 2023-02-21 15:36:35.324475510 +0100
+++ /var/tmp/diff_new_pack.ZJawzP/_new 2023-02-21 15:36:35.332475556 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230217.7fe11a5c
+Version:4.4.1+20230221.eb38cb6e
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ZJawzP/_old 2023-02-21 15:36:35.400475947 +0100
+++ /var/tmp/diff_new_pack.ZJawzP/_new 2023-02-21 15:36:35.404475970 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- ad11a0c0cd93f6d30ad3b836149fdf5a99a8ad99
+ 61f8d99e061ce5bed9285b846e9494e556a7763c
(No newline at EOF)
++ crmsh-4.4.1+20230217.7fe11a5c.tar.bz2 ->
crmsh-4.4.1+20230221.eb38cb6e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230217.7fe11a5c/crmsh/cibconfig.py
new/crmsh-4.4.1+20230221.eb38cb6e/crmsh/cibconfig.py
--- old/crmsh-4.4.1+20230217.7fe11a5c/crmsh/cibconfig.py2023-02-17
09:55:45.0 +0100
+++ new/crmsh-4.4.1+20230221.eb38cb6e/crmsh/cibconfig.py2023-02-21
03:39:22.0 +0100
@@ -28,7 +28,7 @@
from .ra import get_ra, get_properties_list, get_pe_meta, get_properties_meta,
RAInfo
from .utils import ext_cmd, safe_open_w, pipe_string, safe_close_w, crm_msec
from .utils import ask, lines2cli, olist
-from .utils import page_string, cibadmin_can_patch, str2tmp,
ensure_sudo_readable
+from .utils import page_string, str2tmp, ensure_sudo_readable
from .utils import run_ptest, is_id_valid, edit_file, get_boolean,
filter_string
from .xmlutil import is_child_rsc, rsc_constraint, sanitize_cib, rename_id,
get_interesting_nodes
from .xmlutil import is_pref_location, get_topnode, new_cib,
get_rscop_defaults_meta_node
@@ -2619,7 +2619,7 @@
'Commit the configuration to the CIB.'
if not self.is_cib_sane():
return False
-if not replace and cibadmin_can_patch():
+if not replace:
rc = self._patch_cib(force)
else:
rc = self._replace_cib(force)
@@ -2783,9 +2783,8 @@
cib = text2elem(cib)
if not self._import_cib(cib):
return False
-if cibadmin_can_patch():
-self.cib_orig = copy.deepcopy(self.cib_elem)
-sanitize_cib_for_patching(self.cib_orig)
+self.cib_orig = copy.deepcopy(self.cib_elem)
+sanitize_cib_for_patching(self.cib_orig)
sanitize_cib(self.cib_elem)
show_unrecognized_elems(self.cib_elem)
self._populate()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230217.7fe11a5c/crmsh/history.py
new/crmsh-4.4.1+20230221.eb38cb6e/crmsh/history.py
--- old/crmsh-4.4.1+20230217.7fe11a5c/crmsh/history.py 2023-02-17
09:55:45.0 +0100
+++ new/crmsh-4.4.1+20230221.eb38cb6e/crmsh/history.py 2023-02-21
03:39:22.0 +0100
@@ -555,7 +555,6 @@
i = (i+1) % len(self.nodecolors)
def _report_setup_source(self):
-constants.pcmk_version = None
# is this an crm report or a crm_report?
for descname in ("description.txt", "report.summary"):
self.desc = os.path.join(self.loc, descname)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230217.7fe11a5c/crmsh/log_patterns.py
new/crmsh-4.4.1+20230221.eb38cb6e/crmsh/log_patterns.py
--- old/crmsh-4.4.1+20230217.7fe11a5c/crmsh/log_patterns.py 2023-02-17
09:55:45.0 +0100
+++
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-02-17 16:45:41
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.22824 (New)
Package is "crmsh"
Fri Feb 17 16:45:41 2023 rev:279 rq:1066340 version:4.4.1+20230217.7fe11a5c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-02-10
14:35:48.186093612 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.22824/crmsh.changes 2023-02-17
16:46:01.311206218 +0100
@@ -1,0 +2,19 @@
+Fri Feb 17 09:28:33 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230217.7fe11a5c:
+ * Dev: report: Enable crm report for sudoer user
+
+---
+Fri Feb 17 08:53:21 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230217.0dc54cef:
+ * Fix: utils: use parallax_run instead of parallax_call in ServiceManager
+ * Dev: uinttest: adjust unit test for previous change
+ * Fix: behave: fix a regression for bsc#1183654
+ * fix qdevice
+ * fix: utils: check hostname alias in user_of
+ * fix: utils: make ServiceManager to work with new remote calling utils
+ * Dev: bootstrap: guess and ask whether to operate in non-root mode
(jsc#PED-290)
+ * Dev: bootstrap: allow the cluster to operate with ssh session under
non-root sudoer (jsc#PED-290)
+
+---
Old:
crmsh-4.4.1+20230210.df3b7a92.tar.bz2
New:
crmsh-4.4.1+20230217.7fe11a5c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Vcov7k/_old 2023-02-17 16:46:01.915209619 +0100
+++ /var/tmp/diff_new_pack.Vcov7k/_new 2023-02-17 16:46:01.923209665 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230210.df3b7a92
+Version:4.4.1+20230217.7fe11a5c
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Vcov7k/_old 2023-02-17 16:46:02.023210228 +0100
+++ /var/tmp/diff_new_pack.Vcov7k/_new 2023-02-17 16:46:02.039210318 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- df3b7a92af87f9bf14be7b354e15081e171d2f34
+ ad11a0c0cd93f6d30ad3b836149fdf5a99a8ad99
(No newline at EOF)
++ crmsh-4.4.1+20230210.df3b7a92.tar.bz2 ->
crmsh-4.4.1+20230217.7fe11a5c.tar.bz2 ++
2675 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-02-10 14:35:46
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1848 (New)
Package is "crmsh"
Fri Feb 10 14:35:46 2023 rev:278 rq:1064153 version:4.4.1+20230210.df3b7a92
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-01-17
17:35:45.805337313 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1848/crmsh.changes2023-02-10
14:35:48.186093612 +0100
@@ -1,0 +2,26 @@
+Fri Feb 10 03:09:26 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230210.df3b7a92:
+ * Dev: unittest: Adjust unit test for previous change
+ * Dev: behave: Adjust functional test for previous change
+ * Dev: utils: Add sudo for the commands in user hints
+
+---
+Wed Feb 08 14:31:39 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230208.b437e499:
+ * Dev: spec: Requires parallax version 1.0.8
+
+---
+Tue Feb 07 07:23:40 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230207.3485cdd1:
+ * Fix: hawk fails to parse the slash (bsc#1206217)
+
+---
+Sat Jan 28 08:04:37 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230128.8541d6a8:
+ * Fix: extra logs while configuring passwordless (bsc#1207720)
+
+---
Old:
crmsh-4.4.1+20230117.fb8b3c2b.tar.bz2
New:
crmsh-4.4.1+20230210.df3b7a92.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.vUZ4KU/_old 2023-02-10 14:35:48.798097270 +0100
+++ /var/tmp/diff_new_pack.vUZ4KU/_new 2023-02-10 14:35:48.806097318 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230117.fb8b3c2b
+Version:4.4.1+20230210.df3b7a92
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -52,7 +52,7 @@
Requires: /usr/bin/which
Requires: python3 >= 3.4
Requires: python3-lxml
-Requires: python3-parallax
+Requires: python3-parallax >= 1.0.8
Requires: python3-python-dateutil
BuildRequires: python3-lxml
BuildRequires: python3-setuptools
++ _servicedata ++
--- /var/tmp/diff_new_pack.vUZ4KU/_old 2023-02-10 14:35:48.886097795 +0100
+++ /var/tmp/diff_new_pack.vUZ4KU/_new 2023-02-10 14:35:48.890097820 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- fb8b3c2ba172e54af2192b96c3fdbf0d7561ea56
+ df3b7a92af87f9bf14be7b354e15081e171d2f34
(No newline at EOF)
++ crmsh-4.4.1+20230117.fb8b3c2b.tar.bz2 ->
crmsh-4.4.1+20230210.df3b7a92.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230117.fb8b3c2b/crmsh/bootstrap.py
new/crmsh-4.4.1+20230210.df3b7a92/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20230117.fb8b3c2b/crmsh/bootstrap.py2023-01-17
09:08:55.0 +0100
+++ new/crmsh-4.4.1+20230210.df3b7a92/crmsh/bootstrap.py2023-02-10
03:35:40.0 +0100
@@ -1583,7 +1583,6 @@
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)
-print(result)
if result.returncode != 0:
utils.fatal("Can't get the remote id_rsa.pub from {}: {}".format(
remote_node,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230117.fb8b3c2b/crmsh/utils.py
new/crmsh-4.4.1+20230210.df3b7a92/crmsh/utils.py
--- old/crmsh-4.4.1+20230117.fb8b3c2b/crmsh/utils.py2023-01-17
09:08:55.0 +0100
+++ new/crmsh-4.4.1+20230210.df3b7a92/crmsh/utils.py2023-02-10
03:35:40.0 +0100
@@ -3382,13 +3382,13 @@
hints = f"""Please run this command starting with "sudo".
Currently, this command needs to use sudo to escalate itself as root.
Please consider to add "{current_user}" as sudoer. For example:
- echo "{current_user} ALL=(ALL) NOPASSWD:ALL" >
/etc/sudoers.d/{current_user}"""
+ sudo bash -c 'echo "{current_user} ALL=(ALL) NOPASSWD:ALL" >
/etc/sudoers.d/{current_user}'"""
else:
hints = f"""This command needs higher privilege.
Option 1) Please consider to add "{current_user}" as sudoer. For example:
- echo "{current_user} ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/{current_user}
+ sudo bash -c 'echo "{current_user} ALL=(ALL) NOPASSWD:ALL" >
/etc/sudoers.d/{current_user}'
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-01-17 17:35:32
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.32243 (New)
Package is "crmsh"
Tue Jan 17 17:35:32 2023 rev:277 rq:1058840 version:4.4.1+20230117.fb8b3c2b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-01-16
18:02:00.987864425 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.32243/crmsh.changes 2023-01-17
17:35:45.805337313 +0100
@@ -1,0 +2,12 @@
+Tue Jan 17 08:42:48 UTC 2023 - nicholas.y...@suse.com
+
+- Update to version 4.4.1+20230117.fb8b3c2b:
+ * Dev: unittest: adjust unit tests for previous change
+ * Dev: healthcheck: allow using non-root sudoer for remote access
+ * Fix: bootstrap: corosync-cfgtool -R requires privilege
+ * Dev: bootstrap: implement swapping hacluster's ssh key using non-root
sudoer remote access
+ * Dev: unittest: Add unit test for previous change
+ * Dev: behave: Add user_access.feature to do functional test for previous
change
+ * Dev: utils: Check current user's privilege and give hints to user
+
+---
Old:
crmsh-4.4.1+20230115.e69ffac7.tar.bz2
New:
crmsh-4.4.1+20230117.fb8b3c2b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.gzNFNI/_old 2023-01-17 17:35:46.761342703 +0100
+++ /var/tmp/diff_new_pack.gzNFNI/_new 2023-01-17 17:35:46.761342703 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230115.e69ffac7
+Version:4.4.1+20230117.fb8b3c2b
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.gzNFNI/_old 2023-01-17 17:35:46.809342974 +0100
+++ /var/tmp/diff_new_pack.gzNFNI/_new 2023-01-17 17:35:46.809342974 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- e69ffac7f6e674d5c717ccb4bbd77b12560d2dd6
+ fb8b3c2ba172e54af2192b96c3fdbf0d7561ea56
(No newline at EOF)
++ crmsh-4.4.1+20230115.e69ffac7.tar.bz2 ->
crmsh-4.4.1+20230117.fb8b3c2b.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20230115.e69ffac7/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.1+20230117.fb8b3c2b/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.1+20230115.e69ffac7/.github/workflows/crmsh-ci.yml
2023-01-15 08:56:56.0 +0100
+++ new/crmsh-4.4.1+20230117.fb8b3c2b/.github/workflows/crmsh-ci.yml
2023-01-17 09:08:55.0 +0100
@@ -62,8 +62,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-index=`$GET_INDEX_OF crm_report_bugs`
-$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
+$DOCKER_SCRIPT `$GET_INDEX_OF crm_report_bugs`
functional_test_bootstrap_bugs:
runs-on: ubuntu-20.04
@@ -220,6 +219,17 @@
sudo systemctl restart docker.service
$DOCKER_SCRIPT `$GET_INDEX_OF cluster_api`
+ functional_test_user_access:
+runs-on: ubuntu-20.04
+timeout-minutes: 40
+steps:
+- uses: actions/checkout@v3
+- name: functional test for user access
+ run: |
+echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
+sudo systemctl restart docker.service
+$DOCKER_SCRIPT `$GET_INDEX_OF user_access`
+
original_regression_test:
runs-on: ubuntu-20.04
timeout-minutes: 40
@@ -246,6 +256,7 @@
functional_test_geo_cluster,
functional_test_healthcheck,
functional_test_cluster_api,
+ functional_test_user_access,
original_regression_test]
runs-on: ubuntu-20.04
timeout-minutes: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20230115.e69ffac7/crmsh/bootstrap.py
new/crmsh-4.4.1+20230117.fb8b3c2b/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20230115.e69ffac7/crmsh/bootstrap.py2023-01-15
08:56:56.0 +0100
+++ new/crmsh-4.4.1+20230117.fb8b3c2b/crmsh/bootstrap.py2023-01-17
09:08:55.0 +0100
@@ -11,8 +11,9 @@
#
# TODO: Make csync2 usage optional
# TODO: Configuration file for bootstrap?
-
+import codecs
import os
+import subprocess
import sys
import random
import re
@@ -26,7 +27,7 @@
from lxml import etree
from pathlib import Path
from contextlib import contextmanager
-from .
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-01-16 17:59:21
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.32243 (New)
Package is "crmsh"
Mon Jan 16 17:59:21 2023 rev:276 rq:1058606 version:4.4.1+20230115.e69ffac7
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2023-01-06
17:06:39.988555654 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.32243/crmsh.changes 2023-01-16
18:02:00.987864425 +0100
@@ -1,0 +2,14 @@
+Sun Jan 15 08:34:31 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230115.e69ffac7:
+ * Fix spelling errors.
+ * Don't use inspect.getargspec, removed in Python 3.11.
+
+---
+Wed Jan 11 08:20:29 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230111.89dfe511:
+ * Dev: behave: Add 'sudo' before most of commands
+ * Dev: behave: Run all cases twice under normal user
+
+---
Old:
crmsh-4.4.1+20230106.b020209b.tar.bz2
New:
crmsh-4.4.1+20230115.e69ffac7.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.1JH2eK/_old 2023-01-16 18:02:01.871869385 +0100
+++ /var/tmp/diff_new_pack.1JH2eK/_new 2023-01-16 18:02:01.875869408 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20230106.b020209b
+Version:4.4.1+20230115.e69ffac7
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.1JH2eK/_old 2023-01-16 18:02:01.923869677 +0100
+++ /var/tmp/diff_new_pack.1JH2eK/_new 2023-01-16 18:02:01.927869700 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 591fc3f7119e3c02d37d3bb1a8438a2f4fac6723
+ e69ffac7f6e674d5c717ccb4bbd77b12560d2dd6
(No newline at EOF)
++ crmsh-4.4.1+20230106.b020209b.tar.bz2 ->
crmsh-4.4.1+20230115.e69ffac7.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20230106.b020209b/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.1+20230115.e69ffac7/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.1+20230106.b020209b/.github/workflows/crmsh-ci.yml
2023-01-06 07:53:15.0 +0100
+++ new/crmsh-4.4.1+20230115.e69ffac7/.github/workflows/crmsh-ci.yml
2023-01-15 08:56:56.0 +0100
@@ -62,7 +62,8 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT `$GET_INDEX_OF crm_report_bugs`
+index=`$GET_INDEX_OF crm_report_bugs`
+$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
functional_test_bootstrap_bugs:
runs-on: ubuntu-20.04
@@ -73,7 +74,8 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT `$GET_INDEX_OF bootstrap_bugs`
+index=`$GET_INDEX_OF bootstrap_bugs`
+$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
functional_test_bootstrap_common:
runs-on: ubuntu-20.04
@@ -84,7 +86,8 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT `$GET_INDEX_OF bootstrap_init_join_remove`
+index=`$GET_INDEX_OF bootstrap_init_join_remove`
+$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
functional_test_bootstrap_options:
runs-on: ubuntu-20.04
@@ -95,7 +98,8 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT `$GET_INDEX_OF bootstrap_options`
+index=`$GET_INDEX_OF bootstrap_options`
+$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT $index -u
functional_test_qdevice_setup_remove:
runs-on: ubuntu-20.04
@@ -106,7 +110,8 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT `$GET_INDEX_OF qdevice_setup_remove`
+index=`$GET_INDEX_OF qdevice_setup_remove`
+$DOCKER_SCRIPT $index && $DOCKER_SCRIPT -d &&
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2023-01-06 17:05:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1563 (New)
Package is "crmsh"
Fri Jan 6 17:05:53 2023 rev:275 rq:1056332 version:4.4.1+20230106.b020209b
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-30
11:09:05.937305235 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1563/crmsh.changes2023-01-06
17:06:39.988555654 +0100
@@ -1,0 +2,15 @@
+Fri Jan 06 07:11:07 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230106.b020209b:
+ * Dev: unittest: Adjust unit test based on previous change
+ * Dev: utils: use --preserve-env option, not -E for sudo
+
+---
+Thu Jan 05 12:03:10 UTC 2023 - xli...@suse.com
+
+- Update to version 4.4.1+20230105.6c47d1cc:
+ * Dev: behave: add basic alice-bob init-join test
+ * Dev: unittest: replace root by alice and bob
+ * Feature: replace root by a custom user with root privileges
+
+---
Old:
crmsh-4.4.1+20221228.326c28fd.tar.bz2
New:
crmsh-4.4.1+20230106.b020209b.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.mD7v0W/_old 2023-01-06 17:06:40.540558754 +0100
+++ /var/tmp/diff_new_pack.mD7v0W/_new 2023-01-06 17:06:40.544558776 +0100
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221228.326c28fd
+Version:4.4.1+20230106.b020209b
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.mD7v0W/_old 2023-01-06 17:06:40.588559023 +0100
+++ /var/tmp/diff_new_pack.mD7v0W/_new 2023-01-06 17:06:40.592559046 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 326c28fd1b60f5e1a0c71006e799989869431a75
+ 591fc3f7119e3c02d37d3bb1a8438a2f4fac6723
(No newline at EOF)
++ crmsh-4.4.1+20221228.326c28fd.tar.bz2 ->
crmsh-4.4.1+20230106.b020209b.tar.bz2 ++
2842 lines of diff (skipped)
commit crmsh for openSUSE:Factory
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-12-30 11:08:50
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1563 (New)
Package is "crmsh"
Fri Dec 30 11:08:50 2022 rev:274 rq:1045770 version:4.4.1+20221228.326c28fd
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-27
11:55:12.703364570 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1563/crmsh.changes2022-12-30
11:09:05.937305235 +0100
@@ -1,0 +2,15 @@
+Wed Dec 28 09:46:54 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221228.326c28fd:
+ * Dev: report: 'crm report' to collect journal.log in microseconds
+ * Dev: doc: Add deprecated note for 'crm configure erase'
+ * Dev: ui_configure: Deprecate configure erase sub-command
+
+---
+Wed Dec 28 04:00:43 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221228.7c16362c:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: ui_cluster: Improve cluster start/stop INFO
+
+---
Old:
crmsh-4.4.1+20221227.bd7d326e.tar.bz2
New:
crmsh-4.4.1+20221228.326c28fd.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.sO4leb/_old 2022-12-30 11:09:06.445308271 +0100
+++ /var/tmp/diff_new_pack.sO4leb/_new 2022-12-30 11:09:06.449308296 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221227.bd7d326e
+Version:4.4.1+20221228.326c28fd
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.sO4leb/_old 2022-12-30 11:09:06.497308582 +0100
+++ /var/tmp/diff_new_pack.sO4leb/_new 2022-12-30 11:09:06.497308582 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- bd7d326e7b0c684c3f93a95851474fcb263a5689
+ 326c28fd1b60f5e1a0c71006e799989869431a75
(No newline at EOF)
++ crmsh-4.4.1+20221227.bd7d326e.tar.bz2 ->
crmsh-4.4.1+20221228.326c28fd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20221227.bd7d326e/crmsh/report/utillib.py
new/crmsh-4.4.1+20221228.326c28fd/crmsh/report/utillib.py
--- old/crmsh-4.4.1+20221227.bd7d326e/crmsh/report/utillib.py 2022-12-27
09:04:26.0 +0100
+++ new/crmsh-4.4.1+20221228.326c28fd/crmsh/report/utillib.py 2022-12-28
10:33:36.0 +0100
@@ -342,7 +342,7 @@
logger.debug("journalctl from: '%d' until: '%d' from_time: '%s' to_time:
'%s' > %s",
from_t, to_t, from_time, to_time, outf)
-cmd = 'journalctl -o short-iso --since "%s" --until "%s" --no-pager | tail
-n +2' % \
+cmd = 'journalctl -o short-iso-precise --since "%s" --until "%s"
--no-pager | tail -n +2' % \
(from_time, to_time)
crmutils.str2file(get_command_info(cmd)[1], outf)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221227.bd7d326e/crmsh/ui_cluster.py
new/crmsh-4.4.1+20221228.326c28fd/crmsh/ui_cluster.py
--- old/crmsh-4.4.1+20221227.bd7d326e/crmsh/ui_cluster.py 2022-12-27
09:04:26.0 +0100
+++ new/crmsh-4.4.1+20221228.326c28fd/crmsh/ui_cluster.py 2022-12-28
10:33:36.0 +0100
@@ -90,7 +90,7 @@
@command.skill_level('administrator')
def do_start(self, context, *args):
'''
-Starts the cluster services on all nodes or specific node(s)
+Starts the cluster stack on all nodes or specific node(s)
'''
service_check_list = ["pacemaker.service"]
start_qdevice = False
@@ -101,7 +101,7 @@
node_list = parse_option_for_nodes(context, *args)
for node in node_list[:]:
if all([utils.service_is_active(srv, remote_addr=node) for srv in
service_check_list]):
-logger.info("Cluster services already started on
{}".format(node))
+logger.info("The cluster stack already started on
{}".format(node))
node_list.remove(node)
if not node_list:
return
@@ -112,25 +112,25 @@
if start_qdevice:
qdevice.QDevice.check_qdevice_vote()
for node in node_list:
-logger.info("Cluster services started on {}".format(node))
+logger.info("The cluster stack started on {}".format(node))
@command.skill_level('administrator')
def do_stop(self, context,
commit crmsh for openSUSE:Factory
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-12-27 11:55:02
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1563 (New)
Package is "crmsh"
Tue Dec 27 11:55:02 2022 rev:273 rq:1045457 version:4.4.1+20221227.bd7d326e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-16
17:52:05.608163550 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1563/crmsh.changes2022-12-27
11:55:12.703364570 +0100
@@ -1,0 +2,26 @@
+Tue Dec 27 08:22:09 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221227.bd7d326e:
+ * Dev: upgradeutil: do not ask when running in a background process group
+
+---
+Tue Dec 27 06:45:10 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221227.d0ae243b:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: bootstrap: Unset SBD_DELAY_START when running 'crm cluster start'
(bsc#1202177)
+
+---
+Mon Dec 26 14:05:42 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221226.d38855cb:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: qdevice: Adjust qdevice reload policy
+
+---
+Mon Dec 26 08:11:33 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221226.371d6f7a:
+ * Fix: report: Catch read exception (bsc#1206606)
+
+---
Old:
crmsh-4.4.1+20221215.752a541a.tar.bz2
New:
crmsh-4.4.1+20221227.bd7d326e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.s0R86t/_old 2022-12-27 11:55:13.231367506 +0100
+++ /var/tmp/diff_new_pack.s0R86t/_new 2022-12-27 11:55:13.235367528 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221215.752a541a
+Version:4.4.1+20221227.bd7d326e
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.s0R86t/_old 2022-12-27 11:55:13.295367862 +0100
+++ /var/tmp/diff_new_pack.s0R86t/_new 2022-12-27 11:55:13.299367885 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 752a541abb58dc5163732042ac2f8120739bc93e
+ bd7d326e7b0c684c3f93a95851474fcb263a5689
(No newline at EOF)
++ crmsh-4.4.1+20221215.752a541a.tar.bz2 ->
crmsh-4.4.1+20221227.bd7d326e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221215.752a541a/crmsh/bootstrap.py
new/crmsh-4.4.1+20221227.bd7d326e/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20221215.752a541a/crmsh/bootstrap.py2022-12-15
15:16:07.0 +0100
+++ new/crmsh-4.4.1+20221227.bd7d326e/crmsh/bootstrap.py2022-12-27
09:04:26.0 +0100
@@ -727,25 +727,29 @@
Return success node list
"""
from .sbd import SBDTimeout
-pacemaker_start_msg = "Starting pacemaker"
# not _context means not in init or join process
if not _context and \
utils.package_is_installed("sbd") and \
utils.service_is_enabled("sbd.service") and \
SBDTimeout.is_sbd_delay_start():
-pacemaker_start_msg += "(delaying start of sbd for
{}s)".format(SBDTimeout.get_sbd_delay_start_sec_from_sysconfig())
+target_dir = "/run/systemd/system/sbd.service.d/"
+cmd1 = "mkdir -p {}".format(target_dir)
+target_file = "{}sbd_delay_start_disabled.conf".format(target_dir)
+cmd2 = "echo -e '[Service]\nUnsetEnvironment=SBD_DELAY_START' >
{}".format(target_file)
+cmd3 = "systemctl daemon-reload"
+for cmd in [cmd1, cmd2, cmd3]:
+parallax.parallax_call(node_list, cmd)
-with logger_utils.status_long(pacemaker_start_msg):
-# To avoid possible JOIN flood in corosync
-if len(node_list) > 5:
-for node in node_list[:]:
-time.sleep(0.25)
-try:
-utils.start_service("corosync.service", remote_addr=node)
-except ValueError as err:
-node_list.remove(node)
-logger.error(err)
-return utils.start_service("pacemaker.service", enable=enable_flag,
node_list=node_list)
+# To avoid possible JOIN flood in corosync
+if len(node_list) > 5:
+for node in node_list[:]:
+time.sleep(0.25)
+try:
+
commit crmsh for openSUSE:Factory
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-12-16 17:51:59
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1835 (New)
Package is "crmsh"
Fri Dec 16 17:51:59 2022 rev:272 rq:1043241 version:4.4.1+20221215.752a541a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-13
18:56:27.259519319 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1835/crmsh.changes2022-12-16
17:52:05.608163550 +0100
@@ -1,0 +2,16 @@
+Thu Dec 15 14:33:39 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221215.752a541a:
+ * Fix: behave: cleanup is not applied to nodes that have been removed from
cluster
+ * Dev: behave: add behave test for `crm -F node delete`
+ * Dev: ui_cluster: unused code removal
+ * Dev: unittest: adjust unit test based on previous changes
+ * Dev: ui_node: redirect `node delete` to `cluster remove`
+
+---
+Thu Dec 15 09:42:11 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221215.9fa76957:
+ * Dev: behave: Add functional test for cluster API
+
+---
Old:
crmsh-4.4.1+20221213.6e4f7dfd.tar.bz2
New:
crmsh-4.4.1+20221215.752a541a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.CJjKKe/_old 2022-12-16 17:52:06.108166301 +0100
+++ /var/tmp/diff_new_pack.CJjKKe/_new 2022-12-16 17:52:06.112166323 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221213.6e4f7dfd
+Version:4.4.1+20221215.752a541a
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.CJjKKe/_old 2022-12-16 17:52:06.160166587 +0100
+++ /var/tmp/diff_new_pack.CJjKKe/_new 2022-12-16 17:52:06.164166610 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 196bfc0a6e739054a258f38ddf87012d7ba01dcc
+ 752a541abb58dc5163732042ac2f8120739bc93e
(No newline at EOF)
++ crmsh-4.4.1+20221213.6e4f7dfd.tar.bz2 ->
crmsh-4.4.1+20221215.752a541a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20221213.6e4f7dfd/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.1+20221215.752a541a/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.1+20221213.6e4f7dfd/.github/workflows/crmsh-ci.yml
2022-12-13 09:03:40.0 +0100
+++ new/crmsh-4.4.1+20221215.752a541a/.github/workflows/crmsh-ci.yml
2022-12-15 15:16:07.0 +0100
@@ -196,6 +196,17 @@
sudo systemctl restart docker.service
$DOCKER_SCRIPT `$GET_INDEX_OF healthcheck`
+ functional_test_cluster_api:
+runs-on: ubuntu-20.04
+timeout-minutes: 40
+steps:
+- uses: actions/checkout@v3
+- name: functional test for cluster api
+ run: |
+echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
+sudo systemctl restart docker.service
+$DOCKER_SCRIPT `$GET_INDEX_OF cluster_api`
+
original_regression_test:
runs-on: ubuntu-20.04
timeout-minutes: 40
@@ -221,6 +232,7 @@
functional_test_constraints_bugs,
functional_test_geo_cluster,
functional_test_healthcheck,
+ functional_test_cluster_api,
original_regression_test]
runs-on: ubuntu-20.04
timeout-minutes: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221213.6e4f7dfd/crmsh/bootstrap.py
new/crmsh-4.4.1+20221215.752a541a/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20221213.6e4f7dfd/crmsh/bootstrap.py2022-12-13
09:03:40.0 +0100
+++ new/crmsh-4.4.1+20221215.752a541a/crmsh/bootstrap.py2022-12-15
15:16:07.0 +0100
@@ -40,7 +40,7 @@
from . import qdevice
from . import parallax
from . import log
-
+from .ui_node import NodeMgmt
logger = log.setup_logger(__name__)
logger_utils = log.LoggerUtils(logger)
@@ -2001,9 +2001,8 @@
# execute the command : crm node delete $HOSTNAME
logger.info("Removing the node {}".format(node))
-rc, _, err = invoke("crm node delete {}".format(node))
-if not rc:
-utils.fatal("Failed to remove {}: {}".format(node, err))
+if not NodeMgmt.call_delnode(node):
+utils.fatal("Failed to remove {}.".format(node))
if not invokerc("sed -i /{}/d {}".format(node, CSYNC2_CFG)):
utils.fatal("Removing the node {} from {}
commit crmsh for openSUSE:Factory
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-12-13 18:56:15
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1835 (New)
Package is "crmsh"
Tue Dec 13 18:56:15 2022 rev:271 rq:1042567 version:4.4.1+20221213.6e4f7dfd
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-09
13:19:37.663590267 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1835/crmsh.changes2022-12-13
18:56:27.259519319 +0100
@@ -1,0 +2,8 @@
+Tue Dec 13 08:20:54 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221213.6e4f7dfd:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: behave: Add functional test for -x option to skip csync2
+ * Dev: bootstrap: Add option -x to skip csync2 initialization stage during
the whole cluster bootstrap
+
+---
Old:
crmsh-4.4.1+20221207.84e6ea16.tar.bz2
New:
crmsh-4.4.1+20221213.6e4f7dfd.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.SCJuii/_old 2022-12-13 18:56:27.867522564 +0100
+++ /var/tmp/diff_new_pack.SCJuii/_new 2022-12-13 18:56:27.875522607 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221207.84e6ea16
+Version:4.4.1+20221213.6e4f7dfd
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.SCJuii/_old 2022-12-13 18:56:27.919522841 +0100
+++ /var/tmp/diff_new_pack.SCJuii/_new 2022-12-13 18:56:27.923522863 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 84e6ea16faf7d379e21af00ba934a6b644723309
+ 196bfc0a6e739054a258f38ddf87012d7ba01dcc
(No newline at EOF)
++ crmsh-4.4.1+20221207.84e6ea16.tar.bz2 ->
crmsh-4.4.1+20221213.6e4f7dfd.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221207.84e6ea16/crmsh/bootstrap.py
new/crmsh-4.4.1+20221213.6e4f7dfd/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20221207.84e6ea16/crmsh/bootstrap.py2022-12-07
03:10:51.0 +0100
+++ new/crmsh-4.4.1+20221213.6e4f7dfd/crmsh/bootstrap.py2022-12-13
09:03:40.0 +0100
@@ -34,7 +34,8 @@
from . import tmpfiles
from . import lock
from . import userdir
-from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,
REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX, WAIT_TIMEOUT_MS_DEFAULT
+from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,\
+REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX, CSYNC2_SERVICE,
WAIT_TIMEOUT_MS_DEFAULT
from . import ocfs2
from . import qdevice
from . import parallax
@@ -57,7 +58,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", "csync2.socket"]
+SERVICES_STOP_LIST = ["corosync-qdevice.service", "corosync.service",
"hawk.service", CSYNC2_SERVICE]
USER_LIST = ["root", "hacluster"]
WATCHDOG_CFG = "/etc/modules-load.d/watchdog.conf"
BOOTH_DIR = "/etc/booth"
@@ -91,6 +92,7 @@
self.no_overwrite_sshkey = None
self.nic_list = []
self.node_list = []
+self.node_list_in_cluster = []
self.unicast = None
self.multicast = None
self.admin_ip = None
@@ -126,6 +128,7 @@
self.cloud_type = None
self.is_s390 = False
self.profiles_data = None
+self.skip_csync2 = None
self.profiles_dict = {}
self.default_nic_list = []
self.default_ip_list = []
@@ -222,6 +225,10 @@
logger.warning("-w option is deprecated and will be removed in
future versions")
if self.ocfs2_devices or self.stage == "ocfs2":
ocfs2.OCFS2Manager.verify_ocfs2(self)
+if not self.skip_csync2 and self.type == "init":
+self.skip_csync2 = utils.get_boolean(os.getenv("SKIP_CSYNC2_SYNC"))
+if self.skip_csync2 and self.stage:
+utils.fatal("-x option or SKIP_CSYNC2_SYNC can't be used with any
stage")
self._validate_cluster_node()
self._validate_nodes_option()
self._validate_sbd_option()
@@ -439,7 +446,7 @@
# The communication IP maybe mis-configured
if not xmlutil.CrmMonXmlParser.is_node_online(peer_node):
shutil.copy(COROSYNC_CONF_ORIG,
commit crmsh for openSUSE:Factory
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-12-09 13:18:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1835 (New)
Package is "crmsh"
Fri Dec 9 13:18:11 2022 rev:270 rq:1041757 version:4.4.1+20221207.84e6ea16
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-05
18:01:38.652726341 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1835/crmsh.changes2022-12-09
13:19:37.663590267 +0100
@@ -1,0 +2,16 @@
+Wed Dec 07 02:27:46 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221207.84e6ea16:
+ * Dev: parse: Don't set timeout value when is not set by user meanwhile no
value is advised in the metadata
+ * Dev: parse: complete advised operation values for other actions beside
monitor
+ * Dev: unittest: Add unit test for utils.compatible_role
+ * Dev: parse: Consider compatibility for role when complete operation
actions with advised values
+
+---
+Tue Dec 06 09:17:16 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221206.b25bc04c:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: qdevice: Refactor qdevice validation code
+
+---
Old:
crmsh-4.4.1+20221203.9bb5442e.tar.bz2
New:
crmsh-4.4.1+20221207.84e6ea16.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.BOUFht/_old 2022-12-09 13:19:38.183593030 +0100
+++ /var/tmp/diff_new_pack.BOUFht/_new 2022-12-09 13:19:38.187593051 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221203.9bb5442e
+Version:4.4.1+20221207.84e6ea16
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.BOUFht/_old 2022-12-09 13:19:38.231593285 +0100
+++ /var/tmp/diff_new_pack.BOUFht/_new 2022-12-09 13:19:38.235593306 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- d450e2c49093db2e6ba718b6e92800bd3f843128
+ 84e6ea16faf7d379e21af00ba934a6b644723309
(No newline at EOF)
++ crmsh-4.4.1+20221203.9bb5442e.tar.bz2 ->
crmsh-4.4.1+20221207.84e6ea16.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221203.9bb5442e/crmsh/bootstrap.py
new/crmsh-4.4.1+20221207.84e6ea16/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20221203.9bb5442e/crmsh/bootstrap.py2022-12-03
15:47:59.0 +0100
+++ new/crmsh-4.4.1+20221207.84e6ea16/crmsh/bootstrap.py2022-12-07
03:10:51.0 +0100
@@ -293,7 +293,7 @@
readline.remove_history_item(hlen - 1)
-def prompt_for_string(msg, match=None, default='', valid_func=None,
prev_value=[]):
+def prompt_for_string(msg, match=None, default='', valid_func=None,
prev_value=[], allow_empty=False):
if _context.yes_to_all:
return default
@@ -303,8 +303,10 @@
enable_completion()
if val:
drop_last_history()
-else:
+elif allow_empty:
return None
+else:
+continue
if not match and not valid_func:
return val
if match and not re.match(match, val):
@@ -312,7 +314,10 @@
continue
if valid_func:
try:
-valid_func(val, prev_value)
+if prev_value:
+valid_func(val, prev_value)
+else:
+valid_func(val)
except ValueError as err:
logger.error(err)
continue
@@ -1336,8 +1341,6 @@
return
adminaddr = prompt_for_string('Virtual IP',
valid_func=Validation.valid_admin_ip)
-if not adminaddr:
-utils.fatal("Expected an IP address")
crm_configure_load("update", 'primitive admin-ip IPaddr2 ip=%s op monitor
interval=10 timeout=20' % (utils.doublequote(adminaddr)))
wait_for_resource("Configuring virtual IP ({})".format(adminaddr),
"admin-ip")
@@ -1352,15 +1355,33 @@
logger.info("Configure Qdevice/Qnetd:\n" + QDEVICE_HELP_INFO + "\n")
if not confirm("Do you want to configure QDevice?"):
return
-qnetd_addr = prompt_for_string("HOST or IP of the QNetd server to be used")
-if not qnetd_addr:
-utils.fatal("Address of QNetd is required")
-qdevice_port = prompt_for_string("TCP PORT of QNetd server", default=5403)
-
commit crmsh for openSUSE:Factory
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-12-05 18:01:30
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1835 (New)
Package is "crmsh"
Mon Dec 5 18:01:30 2022 rev:269 rq:1040141 version:4.4.1+20221203.9bb5442e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-12-01
17:22:05.914520486 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1835/crmsh.changes2022-12-05
18:01:38.652726341 +0100
@@ -1,0 +2,17 @@
+Sat Dec 03 15:05:11 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221203.9bb5442e:
+ * Dev: doc: ui_cluster: adapt usage text to asciidoc format
+ * Dev: behave: add assert_eq to print expected and actual values when
assertions fail
+ * Fix: behave: specified destination dir explicitly when source code is
copied into a container
+ * Dev: ui_context: redirect `foo -h`/`foo --help` to `help foo` (bsc#1205735)
+
+---
+Fri Dec 02 09:56:49 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221202.ec9fec0e:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: behave: Add functional test based on previous changes
+ * Dev: bootstrap: remove more configuration files while removing node from
cluster
+
+---
Old:
crmsh-4.4.1+20221201.bdfb0f2c.tar.bz2
New:
crmsh-4.4.1+20221203.9bb5442e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.xRhw2s/_old 2022-12-05 18:01:39.284729782 +0100
+++ /var/tmp/diff_new_pack.xRhw2s/_new 2022-12-05 18:01:39.288729804 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221201.bdfb0f2c
+Version:4.4.1+20221203.9bb5442e
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.xRhw2s/_old 2022-12-05 18:01:39.336730065 +0100
+++ /var/tmp/diff_new_pack.xRhw2s/_new 2022-12-05 18:01:39.340730087 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- bdfb0f2ca98a8d652455b883049070054e677869
+ d450e2c49093db2e6ba718b6e92800bd3f843128
(No newline at EOF)
++ crmsh-4.4.1+20221201.bdfb0f2c.tar.bz2 ->
crmsh-4.4.1+20221203.9bb5442e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/bootstrap.py
new/crmsh-4.4.1+20221203.9bb5442e/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/bootstrap.py2022-12-01
07:11:27.0 +0100
+++ new/crmsh-4.4.1+20221203.9bb5442e/crmsh/bootstrap.py2022-12-03
15:47:59.0 +0100
@@ -132,7 +132,9 @@
self.local_ip_list = []
self.local_network_list = []
self.rm_list = [SYSCONFIG_SBD, CSYNC2_CFG, corosync.conf(), CSYNC2_KEY,
-COROSYNC_AUTH, "/var/lib/heartbeat/crm/*",
"/var/lib/pacemaker/cib/*"]
+COROSYNC_AUTH, "/var/lib/heartbeat/crm/*",
"/var/lib/pacemaker/cib/*",
+"/var/lib/corosync/*", "/var/lib/pacemaker/pengine/*",
PCMK_REMOTE_AUTH,
+"/var/lib/csync2/*"]
@classmethod
def set_context(cls, options):
@@ -1959,6 +1961,18 @@
utils.stop_service(service, disable=True, remote_addr=remote_addr)
+def rm_configuration_files(remote=None):
+"""
+Delete configuration files from the node to be removed
+"""
+utils.get_stdout_or_raise_error("rm -f {}".format('
'.join(_context.rm_list)), remote=remote)
+# restore original sbd configuration file from
/usr/share/fillup-templates/sysconfig.sbd
+if utils.package_is_installed("sbd", remote_addr=remote):
+from .sbd import SBDManager
+cmd = "cp {} {}".format(SBDManager.SYSCONFIG_SBD_TEMPLATE,
SYSCONFIG_SBD)
+utils.get_stdout_or_raise_error(cmd, remote=remote)
+
+
def remove_node_from_cluster():
"""
Remove node from running cluster and the corosync / pacemaker
configuration.
@@ -1968,11 +1982,7 @@
stop_services(SERVICES_STOP_LIST, remote_addr=node)
qdevice.QDevice.remove_qdevice_db([node])
-
-# delete configuration files from the node to be removed
-rc, _, err = invoke('ssh {} root@{} "bash -c \\\"rm -f
{}\\\""'.format(SSH_OPTION, node, " ".join(_context.rm_list)))
-if not rc:
-utils.fatal("Deleting the configuration files failed: {}".format(err))
+rm_configuration_files(node)
# execute the
commit crmsh for openSUSE:Factory
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-12-01 17:21:11
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1835 (New)
Package is "crmsh"
Thu Dec 1 17:21:11 2022 rev:268 rq:1039249 version:4.4.1+20221201.bdfb0f2c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-11-23
09:48:27.999154228 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1835/crmsh.changes2022-12-01
17:22:05.914520486 +0100
@@ -1,0 +2,46 @@
+Thu Dec 01 06:28:39 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221201.bdfb0f2c:
+ * Change: store the upgrade_seq in /etc/crm/
+
+---
+Thu Dec 01 04:31:00 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221201.280e5afb:
+ * Fix: qdevice: Adjust SBD_WATCHDOG_TIMEOUT when configuring qdevice not
using stage (bsc#1205727)
+
+---
+Wed Nov 30 02:00:58 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221130.c3547a20:
+ * Dev: testcases: Adjust original regression test based on previous changes
+ * Dev: behave: Add functional test for previous changes
+ * Fix: cibconfig: Complete promotable=true and interlave=true for
Promoted/Unpromoted resource (bsc#1205522)
+
+---
+Mon Nov 28 09:03:47 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221128.75c824f5:
+ * Dev: bootstrap: return when -N option not specified
+ * Dev: unittest: Add unit test for previous commit
+ * Dev: bootstrap: join process return immediately when joining itself
+
+---
+Mon Nov 28 07:51:22 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221128.1b8068a8:
+ * Dev: log: Use original way for the prompt input
+
+---
+Fri Nov 25 07:39:10 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221125.ef74cf11:
+ * Dev: bootstrap: add timeout to wait_for_cluster and wait_for_resource
+
+---
+Thu Nov 24 08:45:07 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221124.37ac467f:
+ * Fix: corosync: show corosync ring status if has fault (bsc#1205615)
+
+---
Old:
crmsh-4.4.1+20221122.102a8e11.tar.bz2
New:
crmsh-4.4.1+20221201.bdfb0f2c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Pvd32a/_old 2022-12-01 17:22:06.546523942 +0100
+++ /var/tmp/diff_new_pack.Pvd32a/_new 2022-12-01 17:22:06.550523964 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221122.102a8e11
+Version:4.4.1+20221201.bdfb0f2c
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Pvd32a/_old 2022-12-01 17:22:06.606524270 +0100
+++ /var/tmp/diff_new_pack.Pvd32a/_new 2022-12-01 17:22:06.610524292 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 5baaacb0a20a8ed89adaa403a50dacde998688f6
+ bdfb0f2ca98a8d652455b883049070054e677869
(No newline at EOF)
++ crmsh-4.4.1+20221122.102a8e11.tar.bz2 ->
crmsh-4.4.1+20221201.bdfb0f2c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221122.102a8e11/crmsh/bootstrap.py
new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20221122.102a8e11/crmsh/bootstrap.py2022-11-22
15:17:41.0 +0100
+++ new/crmsh-4.4.1+20221201.bdfb0f2c/crmsh/bootstrap.py2022-12-01
07:11:27.0 +0100
@@ -20,6 +20,7 @@
import readline
import shutil
import yaml
+import socket
from string import Template
from lxml import etree
from pathlib import Path
@@ -33,7 +34,7 @@
from . import tmpfiles
from . import lock
from . import userdir
-from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,
REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX
+from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,
REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX, WAIT_TIMEOUT_MS_DEFAULT
from . import ocfs2
from . import qdevice
from . import parallax
@@ -174,6 +175,8 @@
"""
Validate -N/--nodes option
"""
+if not self.node_list:
+return
commit crmsh for openSUSE:Factory
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-11-23 09:48:02
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1597 (New)
Package is "crmsh"
Wed Nov 23 09:48:02 2022 rev:267 rq:1037344 version:4.4.1+20221122.102a8e11
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-11-16
15:43:54.979958006 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1597/crmsh.changes2022-11-23
09:48:27.999154228 +0100
@@ -1,0 +2,21 @@
+Tue Nov 22 14:36:03 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221122.102a8e11:
+ * Dev: workflows: add behave test `healthcheck`
+ * Dev: behave: add functional test for previous changes
+ * Dev: upgradeutil: change the format of seq from int to major.minor
+ * Dev: unittest: move tests to test_healthcheck
+ * Dev: bootstrap: fix passwordless ssh authentication for hacluster
automatically when a new node is joining the cluster (bsc#1201785)
+ * Dev: refactor: extract healthcheck module from upgradeutil
+ * Fix: testcases: fix shadow cib tests for previous changes.
+ * Fix: testcases: add no_reg option for utils.list_cluster_nodes
+ * Dev: unittest: add new tests for upgradeutil
+ * Dev: upgradeutil: automated init ssh passwordless auth for hacluster after
upgrading (bsc#1201785)
+
+---
+Tue Nov 22 10:19:09 UTC 2022 - nicholas.y...@suse.com
+
+- Update to version 4.4.1+20221122.20aa6e8e:
+ * Dev: workflows: update actions version
+
+---
Old:
crmsh-4.4.1+20221116.4faefec3.tar.bz2
New:
crmsh-4.4.1+20221122.102a8e11.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.BKQzyS/_old 2022-11-23 09:48:28.779158298 +0100
+++ /var/tmp/diff_new_pack.BKQzyS/_new 2022-11-23 09:48:28.783158319 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221116.4faefec3
+Version:4.4.1+20221122.102a8e11
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.BKQzyS/_old 2022-11-23 09:48:28.847158653 +0100
+++ /var/tmp/diff_new_pack.BKQzyS/_new 2022-11-23 09:48:28.851158674 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 4faefec3264baba80b0f2bd59aa718280062f7c2
+ 5baaacb0a20a8ed89adaa403a50dacde998688f6
(No newline at EOF)
++ crmsh-4.4.1+20221116.4faefec3.tar.bz2 ->
crmsh-4.4.1+20221122.102a8e11.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20221116.4faefec3/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.1+20221122.102a8e11/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.1+20221116.4faefec3/.github/workflows/crmsh-ci.yml
2022-11-16 04:36:27.0 +0100
+++ new/crmsh-4.4.1+20221122.102a8e11/.github/workflows/crmsh-ci.yml
2022-11-22 15:17:41.0 +0100
@@ -18,9 +18,9 @@
jobs:
general_check:
-runs-on: ubuntu-latest
+runs-on: ubuntu-20.04
steps:
-- uses: actions/checkout@v2
+- uses: actions/checkout@v3
- name: check data-manifest
run: |
./update-data-manifest.sh
@@ -33,16 +33,16 @@
}
unit_test:
-runs-on: ubuntu-latest
+runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['3.6', '3.8', '3.10']
fail-fast: false
timeout-minutes: 5
steps:
-- uses: actions/checkout@v2
+- uses: actions/checkout@v3
- name: Set up Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -54,10 +54,10 @@
tox -v -e${{ matrix.python-version }}
functional_test_crm_report_bugs:
-runs-on: ubuntu-latest
+runs-on: ubuntu-20.04
timeout-minutes: 40
steps:
-- uses: actions/checkout@v2
+- uses: actions/checkout@v3
- name: functional test for crm_report
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
@@ -65,10 +65,10 @@
$DOCKER_SCRIPT `$GET_INDEX_OF crm_report_bugs`
functional_test_bootstrap_bugs:
-runs-on: ubuntu-latest
+runs-on: ubuntu-20.04
timeout-minutes: 40
steps:
-- uses: actions/checkout@v2
+- uses: actions/checkout@v3
- name: functional test for bootstrap bugs
run: |
commit crmsh for openSUSE:Factory
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-11-16 15:43:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1597 (New)
Package is "crmsh"
Wed Nov 16 15:43:53 2022 rev:266 rq:1035957 version:4.4.1+20221116.4faefec3
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-10-28
19:32:10.435426757 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1597/crmsh.changes2022-11-16
15:43:54.979958006 +0100
@@ -1,0 +2,55 @@
+Wed Nov 16 03:54:57 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221116.4faefec3:
+ * Dev: run-functional-tests: get index of test case in github action
+ * Dev: run-functional-tests: Set stonith-enabled=false after setup cluster
+ * Dev: run-functional-tests: Deploy and remove containers in parallel
+
+---
+Tue Nov 15 08:15:12 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221115.10733d98:
+ * Dev: behave: stop sshd.service in test case
+
+---
+Tue Nov 15 05:55:02 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221115.a52067ac:
+ * Dev: crm: Improve error hints when starting crmsh
+
+---
+Sat Nov 12 12:49:20 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221112.1eecda84:
+ * Dev: behave: Add functional test to verify report collect trace ra logs
+ * Dev: report: collect ra trace files from specified directories
+
+---
+Fri Nov 11 00:39:18 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+2022.e52b7fa2:
+ * Dev: behave: Add functional test for tracing ra with specific directory
+ * Dev: Dockerfile: update resource-agents with latest version
+
+---
+Wed Nov 09 02:28:03 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221109.3640f356:
+ * Dev: ui_resource: trace directory in log info should be changed dynamically
+
+---
+Tue Nov 08 03:36:20 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221108.c4182bc4:
+ * Dev: testcases: Adjust origin regression test based on previous changes
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: parse: cli_to_xml: populate advised monitor/start/stop operations
values
+
+---
+Mon Nov 07 03:58:15 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221107.0c91f0d3:
+ * code
+ * Dev: behave: Add functional test for parallax OSError: [Errno 24] Too many
open files
+
+---
Old:
crmsh-4.4.1+20221027.e42809ff.tar.bz2
New:
crmsh-4.4.1+20221116.4faefec3.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.CeIB13/_old 2022-11-16 15:43:55.575960933 +0100
+++ /var/tmp/diff_new_pack.CeIB13/_new 2022-11-16 15:43:55.579960952 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221027.e42809ff
+Version:4.4.1+20221116.4faefec3
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.CeIB13/_old 2022-11-16 15:43:55.619961149 +0100
+++ /var/tmp/diff_new_pack.CeIB13/_new 2022-11-16 15:43:55.623961168 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- e42809ff2422901768967a79b9374e446f394c58
+ 4faefec3264baba80b0f2bd59aa718280062f7c2
(No newline at EOF)
++ crmsh-4.4.1+20221027.e42809ff.tar.bz2 ->
crmsh-4.4.1+20221116.4faefec3.tar.bz2 ++
2725 lines of diff (skipped)
commit crmsh for openSUSE:Factory
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-10-28 19:31:27
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2275 (New)
Package is "crmsh"
Fri Oct 28 19:31:27 2022 rev:265 rq:1031831 version:4.4.1+20221027.e42809ff
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-10-25
11:39:48.420522378 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2275/crmsh.changes2022-10-28
19:32:10.435426757 +0200
@@ -1,0 +2,16 @@
+Thu Oct 27 05:09:14 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221027.e42809ff:
+ * Packaging: create /var/log/crmsh with tmpfiles.d
+ * fix: behave: mkdir /var/log/crmsh in docker image
+ * Fix: log: ownership and mode of log files should be set in
RotatingFileHandler
+ * Fix: #977 crmsh not working when using ACL
+ * fix: log: fail to open log file even if user is in haclient group
(bsc#1204670)
+
+---
+Wed Oct 26 01:27:08 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221026.a0f9a70f:
+ * fix: userdir: race condition during directory creation
+
+---
Old:
crmsh-4.4.1+20221014.0b04f693.tar.bz2
New:
crmsh-4.4.1+20221027.e42809ff.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ISQHvh/_old 2022-10-28 19:32:11.087430026 +0200
+++ /var/tmp/diff_new_pack.ISQHvh/_new 2022-10-28 19:32:11.091430046 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20221014.0b04f693
+Version:4.4.1+20221027.e42809ff
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ISQHvh/_old 2022-10-28 19:32:11.147430327 +0200
+++ /var/tmp/diff_new_pack.ISQHvh/_new 2022-10-28 19:32:11.151430347 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 626f3c90ac626ab6a3d967208bc9186002127740
+ e42809ff2422901768967a79b9374e446f394c58
(No newline at EOF)
++ crmsh-4.4.1+20221014.0b04f693.tar.bz2 ->
crmsh-4.4.1+20221027.e42809ff.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221014.0b04f693/Dockerfile
new/crmsh-4.4.1+20221027.e42809ff/Dockerfile
--- old/crmsh-4.4.1+20221014.0b04f693/Dockerfile2022-10-14
03:36:24.0 +0200
+++ new/crmsh-4.4.1+20221027.e42809ff/Dockerfile2022-10-27
06:51:55.0 +0200
@@ -18,6 +18,7 @@
RUN zypper --non-interactive refresh
RUN zypper --non-interactive up --allow-vendor-change -y python3-parallax
+RUN mkdir -p /var/log/crmsh
RUN mkdir -p /root/.ssh && chmod 0700 /root/.ssh
RUN echo "$ssh_prv_key" > /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa
RUN echo "$ssh_pub_key" > /root/.ssh/id_rsa.pub && chmod 600
/root/.ssh/id_rsa.pub
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20221014.0b04f693/crmsh/log.py
new/crmsh-4.4.1+20221027.e42809ff/crmsh/log.py
--- old/crmsh-4.4.1+20221014.0b04f693/crmsh/log.py 2022-10-14
03:36:24.0 +0200
+++ new/crmsh-4.4.1+20221027.e42809ff/crmsh/log.py 2022-10-27
06:51:55.0 +0200
@@ -102,6 +102,24 @@
return True
+class GroupWriteRotatingFileHandler(logging.handlers.RotatingFileHandler):
+"""
+A custom rotating file handler which keeps log files group wirtable after
rotating
+Source: https://stackoverflow.com/a/6779307
+"""
+def _open(self):
+rtv = super()._open()
+try:
+shutil.chown(rtv.name, group=constants.HA_GROUP)
+os.fchmod(rtv.fileno(), 0o664)
+shutil.chown(rtv.name, user=constants.HA_USER)
+except PermissionError:
+# The file has been open, and FileHandler can write to it.
+# Failing to change owner or mode is not a fatal error.
+pass
+return rtv
+
+
LOGGING_CFG = {
"version": 1,
"disable_existing_loggers": "False",
@@ -141,7 +159,7 @@
"flushLevel": logging.CRITICAL,
},
"file": {
-"class": "logging.handlers.RotatingFileHandler",
+"()": GroupWriteRotatingFileHandler,
"filename": CRMSH_LOG_FILE,
"formatter": "file",
"filters": ["filter"],
@@ -416,14 +434,6 @@
sys.stdout.flush()
-def setup_directory_for_logfile():
-"""
-Create log
commit crmsh for openSUSE:Factory
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-10-25 11:39:46
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2275 (New)
Package is "crmsh"
Tue Oct 25 11:39:46 2022 rev:264 rq:1031083 version:4.4.1+20221014.0b04f693
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-10-17
14:57:59.394126158 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2275/crmsh.changes2022-10-25
11:39:48.420522378 +0200
@@ -1,0 +2,5 @@
+Tue Oct 25 03:30:02 UTC 2022 - Nicholas Yang
+
+- Packaging: create /var/log/crmsh with tmpfiles.d (bsc#1204670)
+
+---
New:
crmsh.tmpfiles.d.conf
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.pCdjeS/_old 2022-10-25 11:39:49.092523864 +0200
+++ /var/tmp/diff_new_pack.pCdjeS/_new 2022-10-25 11:39:49.100523882 +0200
@@ -40,6 +40,7 @@
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
+Source1:%{name}.tmpfiles.d.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@@ -174,10 +175,15 @@
install -Dm0755 %{buildroot}%{_bindir}/crm %{buildroot}%{_sbindir}/crm
rm %{buildroot}%{_bindir}/crm
fi
+install -d -m 0755 %{buildroot}%{_tmpfilesdir}
+install -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
%if 0%{?suse_version}
%fdupes %{buildroot}
%endif
+%post
+%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
+
%if %{with regression_tests}
# Run regression tests after installing the package
# NB: this is called twice by OBS, that's why we touch the file
@@ -212,6 +218,8 @@
%exclude %{_datadir}/%{name}/tests
%exclude %{_datadir}/%{name}/scripts
+%{_tmpfilesdir}/%{name}.conf
+
%doc %{_mandir}/man8/*
%{crmsh_docdir}/COPYING
%{crmsh_docdir}/AUTHORS
++ crmsh.tmpfiles.d.conf ++
d /var/log/crmsh 0775hacluster haclient-
commit crmsh for openSUSE:Factory
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-10-17 14:57:57
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2275 (New)
Package is "crmsh"
Mon Oct 17 14:57:57 2022 rev:263 rq:1011285 version:4.4.1+20221014.0b04f693
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-30
17:58:32.589344640 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2275/crmsh.changes2022-10-17
14:57:59.394126158 +0200
@@ -1,0 +2,12 @@
+Fri Oct 14 01:52:53 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221014.0b04f693:
+ * crm.8.adoc: spelling (recipients, embellishments)
+
+---
+Fri Oct 14 01:08:15 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20221013.11edd97f:
+ * Dev: Dockerfile: update the Dockerfile for updating parallax
+
+---
Old:
crmsh-4.4.1+20220928.3480aa0d.tar.bz2
New:
crmsh-4.4.1+20221014.0b04f693.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.6avHmn/_old 2022-10-17 14:58:00.010127341 +0200
+++ /var/tmp/diff_new_pack.6avHmn/_new 2022-10-17 14:58:00.018127356 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220928.3480aa0d
+Version:4.4.1+20221014.0b04f693
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.6avHmn/_old 2022-10-17 14:58:00.066127449 +0200
+++ /var/tmp/diff_new_pack.6avHmn/_new 2022-10-17 14:58:00.070127456 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 3081582137d44f867222d7161eebca796d2c3293
+ 626f3c90ac626ab6a3d967208bc9186002127740
(No newline at EOF)
++ crmsh-4.4.1+20220928.3480aa0d.tar.bz2 ->
crmsh-4.4.1+20221014.0b04f693.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220928.3480aa0d/Dockerfile
new/crmsh-4.4.1+20221014.0b04f693/Dockerfile
--- old/crmsh-4.4.1+20220928.3480aa0d/Dockerfile2022-09-28
10:37:09.0 +0200
+++ new/crmsh-4.4.1+20221014.0b04f693/Dockerfile2022-10-14
03:36:24.0 +0200
@@ -13,6 +13,10 @@
RUN zypper -n install make autoconf automake vim which libxslt-tools mailx
iproute2 iputils bzip2 openssh tar file glibc-locale-base firewalld
libopenssl1_1 dos2unix iptables
RUN zypper -n install python3 python3-lxml python3-python-dateutil
python3-parallax python3-setuptools python3-PyYAML python3-curses python3-behave
RUN zypper -n install csync2 libglue-devel corosync corosync-qdevice pacemaker
booth corosync-qnetd
+RUN zypper --non-interactive up zypper
+RUN zypper ar -f -G
https://download.opensuse.org/repositories/network:/ha-clustering:/Factory/SLE_15_SP4
repo_nhf
+RUN zypper --non-interactive refresh
+RUN zypper --non-interactive up --allow-vendor-change -y python3-parallax
RUN mkdir -p /root/.ssh && chmod 0700 /root/.ssh
RUN echo "$ssh_prv_key" > /root/.ssh/id_rsa && chmod 600 /root/.ssh/id_rsa
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220928.3480aa0d/doc/crm.8.adoc
new/crmsh-4.4.1+20221014.0b04f693/doc/crm.8.adoc
--- old/crmsh-4.4.1+20220928.3480aa0d/doc/crm.8.adoc2022-09-28
10:37:09.0 +0200
+++ new/crmsh-4.4.1+20221014.0b04f693/doc/crm.8.adoc2022-10-14
03:36:24.0 +0200
@@ -2111,7 +2111,7 @@
Set the node status to maintenance. This is equivalent to the
cluster-wide `maintenance-mode` property but puts just one node
-into the maintenance mode. If there are maintenaned resources on
+into the maintenance mode. If there are maintained resources on
the node, the user will be proposed to remove the maintenance
property from them.
@@ -2158,7 +2158,7 @@
[[cmdhelp_node_show,show node]]
`show`
-Show a node definition. If the node parameter is omitted then all
+Show a node definition. If the node parameter is omitted, then all
nodes are shown.
Usage:
@@ -2173,7 +2173,7 @@
[[cmdhelp_node_status-attr,manage status attributes]]
`status-attr`
-Edit node attributes which are in the CIB status section, i.e.
+Edit node attributes which are in the CIB status section, i.e.,
attributes which hold properties of a more volatile nature. One
typical example is attribute generated by the `pingd` utility.
@@ -2342,7 +2342,7 @@
Some resource management commands, such as
commit crmsh for openSUSE:Factory
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-09-30 17:58:15
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2275 (New)
Package is "crmsh"
Fri Sep 30 17:58:15 2022 rev:262 rq:1007132 version:4.4.1+20220928.3480aa0d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-28
17:51:56.243254489 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2275/crmsh.changes2022-09-30
17:58:32.589344640 +0200
@@ -1,0 +2,20 @@
+Wed Sep 28 08:53:06 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220928.3480aa0d:
+ * Dev: behave: append more functional test for sbd and watchdog
+
+---
+Wed Sep 28 08:19:45 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220928.ef80f673:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Fix: sbd: Ask if overwrite when given sbd device on interactive
mode(bsc#1201428)
+
+---
+Wed Sep 28 06:26:30 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220928.ea5c5190:
+ * Dev: history: print necessary log messages when collecting report
+ * Dev: report: make sure 'crm -d report' could increase the verbosity
+
+---
Old:
crmsh-4.4.1+20220928.ded85d0a.tar.bz2
New:
crmsh-4.4.1+20220928.3480aa0d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.0005tr/_old 2022-09-30 17:58:33.109345752 +0200
+++ /var/tmp/diff_new_pack.0005tr/_new 2022-09-30 17:58:33.117345769 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220928.ded85d0a
+Version:4.4.1+20220928.3480aa0d
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.0005tr/_old 2022-09-30 17:58:33.165345872 +0200
+++ /var/tmp/diff_new_pack.0005tr/_new 2022-09-30 17:58:33.169345880 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 37d4b63487534aa9de6fbfefb8e87812bfad14be
+ 3081582137d44f867222d7161eebca796d2c3293
(No newline at EOF)
++ crmsh-4.4.1+20220928.ded85d0a.tar.bz2 ->
crmsh-4.4.1+20220928.3480aa0d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220928.ded85d0a/crmsh/history.py
new/crmsh-4.4.1+20220928.3480aa0d/crmsh/history.py
--- old/crmsh-4.4.1+20220928.ded85d0a/crmsh/history.py 2022-09-28
02:31:20.0 +0200
+++ new/crmsh-4.4.1+20220928.3480aa0d/crmsh/history.py 2022-09-28
10:37:09.0 +0200
@@ -473,19 +473,21 @@
nodes_option = "'-n %s'" % ' '.join(self.setnodes)
utils.mkdirp(os.path.dirname(d))
logger.info("Retrieving information from cluster nodes, please
wait...")
-rc = utils.pipe_cmd_nosudo("%s -Z -Q -f '%s' %s %s %s %s" %
- (extcmd,
-self.from_dt.ctime(),
-to_option,
-nodes_option,
-str(config.core.report_tool_options),
-d))
+cmd = "{} {} -Z -Q -f '{}' {} {} {} {}".format(extcmd,
+"-v" if config.core.debug else "", self.from_dt.ctime(),
+to_option, nodes_option, str(config.core.report_tool_options),
d)
+logger.debug("Running command: {}".format(cmd))
+rc, out, err = utils.get_stdout_stderr(cmd)
if rc != 0:
+if err:
+print(err)
if os.path.isfile(tarball):
self.warn("report thinks it failed, proceeding anyway")
else:
self.error("report failed")
return None
+if out:
+print(out)
self.last_live_update = time.time()
return self.unpack_report(tarball)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220928.ded85d0a/crmsh/report/constants.py
new/crmsh-4.4.1+20220928.3480aa0d/crmsh/report/constants.py
--- old/crmsh-4.4.1+20220928.ded85d0a/crmsh/report/constants.py 2022-09-28
02:31:20.0 +0200
+++ new/crmsh-4.4.1+20220928.3480aa0d/crmsh/report/constants.py 2022-09-28
10:37:09.0 +0200
@@ -60,7 +60,6 @@
# UNIQUE_MSG = "Mark:HB_REPORT:%d" % now_second
commit crmsh for openSUSE:Factory
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-09-28 17:51:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2275 (New)
Package is "crmsh"
Wed Sep 28 17:51:53 2022 rev:261 rq:1006546 version:4.4.1+20220928.ded85d0a
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-27
20:14:10.997860443 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2275/crmsh.changes2022-09-28
17:51:56.243254489 +0200
@@ -1,0 +2,8 @@
+Wed Sep 28 00:47:23 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220928.ded85d0a:
+ * Dev: behave: Add functional test based on previous changes
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: bootstrap: Adjust cluster properties including priority-fencing-delay
+
+---
Old:
crmsh-4.4.1+20220923.9651e0fa.tar.bz2
New:
crmsh-4.4.1+20220928.ded85d0a.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.E2nAMZ/_old 2022-09-28 17:51:56.77121 +0200
+++ /var/tmp/diff_new_pack.E2nAMZ/_new 2022-09-28 17:51:56.779255567 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220923.9651e0fa
+Version:4.4.1+20220928.ded85d0a
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.E2nAMZ/_old 2022-09-28 17:51:56.827255664 +0200
+++ /var/tmp/diff_new_pack.E2nAMZ/_new 2022-09-28 17:51:56.827255664 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 6236df2587ced94135a27867f11e442090b8d742
+ 37d4b63487534aa9de6fbfefb8e87812bfad14be
(No newline at EOF)
++ crmsh-4.4.1+20220923.9651e0fa.tar.bz2 ->
crmsh-4.4.1+20220928.ded85d0a.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220923.9651e0fa/crmsh/bootstrap.py
new/crmsh-4.4.1+20220928.ded85d0a/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220923.9651e0fa/crmsh/bootstrap.py2022-09-23
10:48:20.0 +0200
+++ new/crmsh-4.4.1+20220928.ded85d0a/crmsh/bootstrap.py2022-09-28
02:31:20.0 +0200
@@ -1376,7 +1376,7 @@
qdevice_inst.config_and_start_qdevice()
if _context.stage == "qdevice":
-adjust_pcmk_delay_max_and_stonith_timeout()
+adjust_properties()
def init():
@@ -1788,7 +1788,7 @@
# attempt to join the cluster failed)
init_cluster_local()
-adjust_pcmk_delay_max_and_stonith_timeout()
+adjust_properties()
with logger_utils.status_long("Reloading cluster configuration"):
@@ -1844,6 +1844,39 @@
utils.disable_service("corosync-qdevice.service")
+def adjust_priority_in_rsc_defaults(is_2node_wo_qdevice):
+"""
+Adjust priority in rsc_defaults
+
+Set priority=1 when current cluster is 2 nodes without qdevice;
+else set priority=0
+"""
+if is_2node_wo_qdevice:
+utils.set_property("priority", 1, property_type="rsc_defaults",
conditional=True)
+else:
+utils.set_property("priority", 0, property_type="rsc_defaults")
+
+
+def adjust_priority_fencing_delay(is_2node_wo_qdevice):
+"""
+Adjust priority-fencing-delay
+
+When pcmk_delay_max is set in fence agent,
+and the current cluster is 2 nodes without qdevice,
+set priority-fencing-delay=2*pcmk_delay_max
+"""
+out = utils.get_stdout_or_raise_error("crm configure show related:stonith")
+if not out:
+return
+pcmk_delay_max_v_list = re.findall("pcmk_delay_max=(\w+)", out)
+if pcmk_delay_max_v_list:
+max_value = max([int(utils.crm_msec(v)/1000) for v in
pcmk_delay_max_v_list])
+if pcmk_delay_max_v_list and is_2node_wo_qdevice:
+utils.set_property("priority-fencing-delay", 2*max_value,
conditional=True)
+else:
+utils.set_property("priority-fencing-delay", 0)
+
+
def start_qdevice_on_join_node(seed_host):
"""
Doing qdevice certificate process and start qdevice service on join node
@@ -1922,7 +1955,7 @@
decrease_expected_votes()
-adjust_pcmk_delay_max_and_stonith_timeout()
+adjust_properties()
logger.info("Propagating configuration changes across the remaining nodes")
csync2_update(CSYNC2_CFG)
@@ -2169,7 +2202,7 @@
else:
logger.warning("To remove qdevice service, need to restart cluster
service manually on each node")
-adjust_pcmk_delay_max_and_stonith_timeout()
+
commit crmsh for openSUSE:Factory
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-09-27 20:14:08
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2275 (New)
Package is "crmsh"
Tue Sep 27 20:14:08 2022 rev:260 rq:1006343 version:4.4.1+20220923.9651e0fa
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-21
14:44:26.898077367 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2275/crmsh.changes2022-09-27
20:14:10.997860443 +0200
@@ -1,0 +2,8 @@
+Fri Sep 23 09:05:44 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220923.9651e0fa:
+ * Dev: unittest: Adjust unit test based on prevous changes
+ * Dev: behave: Add functional test based on previous commit
+ * Fix: ui_cluster: 'crm cluster stop' failed to stop services (bsc#1203601)
+
+---
Old:
crmsh-4.4.1+20220921.dbe833c5.tar.bz2
New:
crmsh-4.4.1+20220923.9651e0fa.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.uYSmPi/_old 2022-09-27 20:14:11.585861740 +0200
+++ /var/tmp/diff_new_pack.uYSmPi/_new 2022-09-27 20:14:11.593861757 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220921.dbe833c5
+Version:4.4.1+20220923.9651e0fa
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.uYSmPi/_old 2022-09-27 20:14:11.633861846 +0200
+++ /var/tmp/diff_new_pack.uYSmPi/_new 2022-09-27 20:14:11.637861855 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- dbe833c5f8703d6a9990ef199ca0b7aae7255b72
+ 6236df2587ced94135a27867f11e442090b8d742
(No newline at EOF)
++ crmsh-4.4.1+20220921.dbe833c5.tar.bz2 ->
crmsh-4.4.1+20220923.9651e0fa.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220921.dbe833c5/crmsh/constants.py
new/crmsh-4.4.1+20220923.9651e0fa/crmsh/constants.py
--- old/crmsh-4.4.1+20220921.dbe833c5/crmsh/constants.py2022-09-21
09:33:20.0 +0200
+++ new/crmsh-4.4.1+20220923.9651e0fa/crmsh/constants.py2022-09-23
10:48:20.0 +0200
@@ -522,4 +522,5 @@
SCHEMA_MIN_VER_SUPPORT_OCF_1_1 = "pacemaker-3.7"
REJOIN_COUNT = 60
REJOIN_INTERVAL = 10
+DC_DEADTIME_DEFAULT = 20
# vim:ts=4:sw=4:et:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220921.dbe833c5/crmsh/ui_cluster.py
new/crmsh-4.4.1+20220923.9651e0fa/crmsh/ui_cluster.py
--- old/crmsh-4.4.1+20220921.dbe833c5/crmsh/ui_cluster.py 2022-09-21
09:33:20.0 +0200
+++ new/crmsh-4.4.1+20220923.9651e0fa/crmsh/ui_cluster.py 2022-09-23
10:48:20.0 +0200
@@ -186,10 +186,18 @@
else:
logger.info("Cluster services already stopped on
{}".format(node))
node_list.remove(node)
+elif not utils.service_is_active("pacemaker.service",
remote_addr=node):
+utils.stop_service("corosync", remote_addr=node)
+logger.info("Cluster services stopped on {}".format(node))
+node_list.remove(node)
if not node_list:
return
-if not utils.get_dc(timeout=5):
+dc_deadtime = utils.get_property("dc-deadtime") or
constants.DC_DEADTIME_DEFAULT
+dc_timeout = int(dc_deadtime.strip('s')) + 5
+try:
+utils.check_function_with_timeout(utils.get_dc,
wait_timeout=dc_timeout)
+except TimeoutError:
logger.error("No DC found currently, please wait if the cluster is
still starting")
return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220921.dbe833c5/crmsh/utils.py
new/crmsh-4.4.1+20220923.9651e0fa/crmsh/utils.py
--- old/crmsh-4.4.1+20220921.dbe833c5/crmsh/utils.py2022-09-21
09:33:20.0 +0200
+++ new/crmsh-4.4.1+20220923.9651e0fa/crmsh/utils.py2022-09-23
10:48:20.0 +0200
@@ -837,10 +837,8 @@
return False
-def get_dc(timeout=None):
-cmd = "crmadmin -D"
-if timeout:
-cmd += " -t {}".format(timeout)
+def get_dc():
+cmd = "crmadmin -D -t 1"
rc, s, _ = get_stdout_stderr(add_sudo(cmd))
if rc != 0:
return None
@@ -3002,7 +3000,8 @@
"""
Get cluster properties
"""
-cmd = "crm configure get_property " + name
+cib_path =
commit crmsh for openSUSE:Factory
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-09-21 14:43:26
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Wed Sep 21 14:43:26 2022 rev:259 rq:1005173 version:4.4.1+20220921.dbe833c5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-19
16:03:56.794248104 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-09-21
14:44:26.898077367 +0200
@@ -1,0 +2,14 @@
+Wed Sep 21 10:23:36 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220921.dbe833c5:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: bootstrap: Adjust pcmk_delay_max and stonith-timeout for all
configured fence agents
+
+---
+Mon Sep 19 14:36:59 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220919.2ab5b976:
+ * Dev: doc: add help info for related:class for 'configure show' command
+ * Dev: cibconfig: "crm config show related:xxx" provides partial search
among class, provider, type fields
+
+---
Old:
crmsh-4.4.1+20220915.afcd88e6.tar.bz2
New:
crmsh-4.4.1+20220921.dbe833c5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.8m3dbI/_old 2022-09-21 14:44:27.482078892 +0200
+++ /var/tmp/diff_new_pack.8m3dbI/_new 2022-09-21 14:44:27.490078913 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220915.afcd88e6
+Version:4.4.1+20220921.dbe833c5
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.8m3dbI/_old 2022-09-21 14:44:27.530079018 +0200
+++ /var/tmp/diff_new_pack.8m3dbI/_new 2022-09-21 14:44:27.534079027 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 46ff3da7a92920e3e0e73d69c73e51a8846fd223
+ dbe833c5f8703d6a9990ef199ca0b7aae7255b72
(No newline at EOF)
++ crmsh-4.4.1+20220915.afcd88e6.tar.bz2 ->
crmsh-4.4.1+20220921.dbe833c5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220915.afcd88e6/crmsh/bootstrap.py
new/crmsh-4.4.1+20220921.dbe833c5/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220915.afcd88e6/crmsh/bootstrap.py2022-09-15
14:33:01.0 +0200
+++ new/crmsh-4.4.1+20220921.dbe833c5/crmsh/bootstrap.py2022-09-21
09:33:20.0 +0200
@@ -32,7 +32,7 @@
from . import tmpfiles
from . import lock
from . import userdir
-from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,
REJOIN_COUNT, REJOIN_INTERVAL
+from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,
REJOIN_COUNT, REJOIN_INTERVAL, PCMK_DELAY_MAX
from . import ocfs2
from . import qdevice
from . import parallax
@@ -1375,9 +1375,8 @@
qdevice_inst.config_and_start_qdevice()
-if _context.stage == "qdevice" and utils.service_is_active("sbd.service"):
-from .sbd import SBDTimeout
-SBDTimeout.adjust_sbd_timeout_related_cluster_configuration()
+if _context.stage == "qdevice":
+adjust_pcmk_delay_max_and_stonith_timeout()
def init():
@@ -1789,13 +1788,7 @@
# attempt to join the cluster failed)
init_cluster_local()
-if utils.service_is_active("sbd.service"):
-from .sbd import SBDTimeout
-SBDTimeout.adjust_sbd_timeout_related_cluster_configuration()
-else:
-value = get_stonith_timeout_generally_expected()
-if value:
-utils.set_property_conditionally("stonith-timeout", value)
+adjust_pcmk_delay_max_and_stonith_timeout()
with logger_utils.status_long("Reloading cluster configuration"):
@@ -1902,10 +1895,6 @@
"""
Remove node from running cluster and the corosync / pacemaker
configuration.
"""
-if utils.service_is_active("sbd.service"):
-from .sbd import SBDTimeout
-
SBDTimeout.adjust_sbd_timeout_related_cluster_configuration(removing=True)
-
node = _context.cluster_node
set_cluster_node_ip()
@@ -1933,6 +1922,8 @@
decrease_expected_votes()
+adjust_pcmk_delay_max_and_stonith_timeout()
+
logger.info("Propagating configuration changes across the remaining nodes")
csync2_update(CSYNC2_CFG)
csync2_update(corosync.conf())
@@ -2178,9 +2169,7 @@
else:
logger.warning("To remove qdevice service, need to
commit crmsh for openSUSE:Factory
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-09-19 16:03:49
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Mon Sep 19 16:03:49 2022 rev:258 rq:1004524 version:4.4.1+20220915.afcd88e6
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-14
13:44:51.905876575 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-09-19
16:03:56.794248104 +0200
@@ -1,0 +2,13 @@
+Thu Sep 15 12:48:47 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220915.afcd88e6:
+ * Dev: behave: Add functional test case based on previous changes
+ * Dev: bootstrap: Adjust sbd related timeout when add/remove qdevice
+
+---
+Wed Sep 14 06:00:41 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220914.fa29aa2c:
+ * Fix: crash_test: do not use firewalld to isolate a cluster node
(bsc#1192467)
+
+---
Old:
crmsh-4.4.1+20220913.57fa9d96.tar.bz2
New:
crmsh-4.4.1+20220915.afcd88e6.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.EQPSSp/_old 2022-09-19 16:03:57.410249750 +0200
+++ /var/tmp/diff_new_pack.EQPSSp/_new 2022-09-19 16:03:57.414249761 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220913.57fa9d96
+Version:4.4.1+20220915.afcd88e6
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.EQPSSp/_old 2022-09-19 16:03:57.458249878 +0200
+++ /var/tmp/diff_new_pack.EQPSSp/_new 2022-09-19 16:03:57.462249889 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 57fa9d96091d03ead44b36d733ff41cd697f5284
+ 46ff3da7a92920e3e0e73d69c73e51a8846fd223
(No newline at EOF)
++ crmsh-4.4.1+20220913.57fa9d96.tar.bz2 ->
crmsh-4.4.1+20220915.afcd88e6.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220913.57fa9d96/crmsh/bootstrap.py
new/crmsh-4.4.1+20220915.afcd88e6/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220913.57fa9d96/crmsh/bootstrap.py2022-09-13
09:37:22.0 +0200
+++ new/crmsh-4.4.1+20220915.afcd88e6/crmsh/bootstrap.py2022-09-15
14:33:01.0 +0200
@@ -1375,6 +1375,10 @@
qdevice_inst.config_and_start_qdevice()
+if _context.stage == "qdevice" and utils.service_is_active("sbd.service"):
+from .sbd import SBDTimeout
+SBDTimeout.adjust_sbd_timeout_related_cluster_configuration()
+
def init():
"""
@@ -2174,6 +2178,10 @@
else:
logger.warning("To remove qdevice service, need to restart cluster
service manually on each node")
+if utils.service_is_active("sbd.service"):
+from .sbd import SBDTimeout
+SBDTimeout.adjust_sbd_timeout_related_cluster_configuration()
+
def bootstrap_remove(context):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220913.57fa9d96/crmsh/crash_test/main.py
new/crmsh-4.4.1+20220915.afcd88e6/crmsh/crash_test/main.py
--- old/crmsh-4.4.1+20220913.57fa9d96/crmsh/crash_test/main.py 2022-09-13
09:37:22.0 +0200
+++ new/crmsh-4.4.1+20220915.afcd88e6/crmsh/crash_test/main.py 2022-09-15
14:33:01.0 +0200
@@ -155,7 +155,7 @@
group_mutual.add_argument('--fence-node', dest='fence_node',
metavar='NODE',
help='Fence specific node')
group_mutual.add_argument('--split-brain-iptables', dest='sp_iptables',
action='store_true',
- help='Make split brain by blocking corosync
ports')
+ help='Make split brain by blocking traffic
between cluster nodes')
parser.add_argument('-l', '--kill-loop', dest='loop', action='store_true',
help='Kill process in loop')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220913.57fa9d96/crmsh/crash_test/task.py
new/crmsh-4.4.1+20220915.afcd88e6/crmsh/crash_test/task.py
--- old/crmsh-4.4.1+20220913.57fa9d96/crmsh/crash_test/task.py 2022-09-13
09:37:22.0 +0200
+++ new/crmsh-4.4.1+20220915.afcd88e6/crmsh/crash_test/task.py 2022-09-15
14:33:01.0 +0200
@@ -437,14 +437,14 @@
class TaskSplitBrain(Task):
"""
-Class to define
commit crmsh for openSUSE:Factory
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-09-14 13:44:43
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Wed Sep 14 13:44:43 2022 rev:257 rq:1003341 version:4.4.1+20220913.57fa9d96
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-08
14:24:07.814734857 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-09-14
13:44:51.905876575 +0200
@@ -1,0 +2,8 @@
+Tue Sep 13 07:53:14 UTC 2022 - zz...@suse.com
+
+- Update to version 4.4.1+20220913.57fa9d96:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: utils: Refactor class ServiceManager, to show all nodes' status when
running in parallel
+ * Dev: bootstrap: Add delay to start corosync when node list larger than 5
+
+---
Old:
crmsh-4.4.1+20220908.d668787c.tar.bz2
New:
crmsh-4.4.1+20220913.57fa9d96.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.LkZws5/_old 2022-09-14 13:44:52.489878045 +0200
+++ /var/tmp/diff_new_pack.LkZws5/_new 2022-09-14 13:44:52.497878066 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220908.d668787c
+Version:4.4.1+20220913.57fa9d96
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.LkZws5/_old 2022-09-14 13:44:52.549878196 +0200
+++ /var/tmp/diff_new_pack.LkZws5/_new 2022-09-14 13:44:52.553878206 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- d668787cd5b5d0c5339e6c993d2a68ee2d2e02fb
+ 57fa9d96091d03ead44b36d733ff41cd697f5284
(No newline at EOF)
++ crmsh-4.4.1+20220908.d668787c.tar.bz2 ->
crmsh-4.4.1+20220913.57fa9d96.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220908.d668787c/crmsh/bootstrap.py
new/crmsh-4.4.1+20220913.57fa9d96/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220908.d668787c/crmsh/bootstrap.py2022-09-08
08:15:31.0 +0200
+++ new/crmsh-4.4.1+20220913.57fa9d96/crmsh/bootstrap.py2022-09-13
09:37:22.0 +0200
@@ -685,6 +685,8 @@
"""
Start pacemaker service with wait time for sbd
When node_list set, start pacemaker service in parallel
+
+Return success node list
"""
from .sbd import SBDTimeout
pacemaker_start_msg = "Starting pacemaker"
@@ -694,8 +696,18 @@
utils.service_is_enabled("sbd.service") and \
SBDTimeout.is_sbd_delay_start():
pacemaker_start_msg += "(delaying start of sbd for
{}s)".format(SBDTimeout.get_sbd_delay_start_sec_from_sysconfig())
+
with logger_utils.status_long(pacemaker_start_msg):
-utils.start_service("pacemaker.service", enable=enable_flag,
node_list=node_list)
+# To avoid possible JOIN flood in corosync
+if len(node_list) > 5:
+for node in node_list[:]:
+time.sleep(0.25)
+try:
+utils.start_service("corosync.service", remote_addr=node)
+except ValueError as err:
+node_list.remove(node)
+logger.error(err)
+return utils.start_service("pacemaker.service", enable=enable_flag,
node_list=node_list)
def install_tmp(tmpfile, to):
@@ -1342,6 +1354,9 @@
utils.disable_service("corosync-qdevice.service")
return
logger.info("""Configure Qdevice/Qnetd:""")
+for node in utils.list_cluster_nodes():
+if not utils.service_is_available("corosync-qdevice.service", node):
+utils.fatal("corosync-qdevice.service is not available on
{}".format(node))
qdevice_inst = _context.qdevice_inst
qnetd_addr = qdevice_inst.qnetd_addr
# Configure ssh passwordless to qnetd if detect password is needed
@@ -1680,6 +1695,10 @@
else:
corosync.set_value("totem.nodeid", nodeid)
+is_qdevice_configured = utils.is_qdevice_configured()
+if is_qdevice_configured and not
utils.service_is_available("corosync-qdevice.service"):
+utils.fatal("corosync-qdevice.service is not available")
+
shutil.copy(corosync.conf(), COROSYNC_CONF_ORIG)
# check if use IPv6
@@ -1756,7 +1775,6 @@
local_nodeid = get_local_nodeid()
update_nodeid(local_nodeid)
-is_qdevice_configured = utils.is_qdevice_configured()
if
commit crmsh for openSUSE:Factory
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-09-08 14:23:39
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Thu Sep 8 14:23:39 2022 rev:256 rq:1001862 version:4.4.1+20220908.d668787c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-09-02
21:57:06.096377604 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-09-08
14:24:07.814734857 +0200
@@ -1,0 +2,21 @@
+Thu Sep 08 06:30:59 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220908.d668787c:
+ * Dev: add remote_auth to known stages of cluster init
+ * Dev: add unit tests for SBDTimeout.initialize_timeout
+ * Dev: refactor timeout caculation for sbd
+
+---
+Thu Sep 08 02:00:33 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220908.88a9f0c9:
+ * Dev: GH-workflows: Add a general check to check if data-manifest changed
+
+---
+Mon Sep 05 14:51:59 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220905.311a0a0d:
+ * Dev: testcases: adjust origin testcases based on previous changes
+ * Dev: data-manifest: Update content of data-manifest since #1022 added new
files
+
+---
Old:
crmsh-4.4.1+20220902.dceb5b92.tar.bz2
New:
crmsh-4.4.1+20220908.d668787c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.qOFHIg/_old 2022-09-08 14:24:08.378736159 +0200
+++ /var/tmp/diff_new_pack.qOFHIg/_new 2022-09-08 14:24:08.386736177 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220902.dceb5b92
+Version:4.4.1+20220908.d668787c
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.qOFHIg/_old 2022-09-08 14:24:08.470736371 +0200
+++ /var/tmp/diff_new_pack.qOFHIg/_new 2022-09-08 14:24:08.474736380 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 051a68726275e7f61ba85da01354fd4536ac746f
+ d668787cd5b5d0c5339e6c993d2a68ee2d2e02fb
(No newline at EOF)
++ crmsh-4.4.1+20220902.dceb5b92.tar.bz2 ->
crmsh-4.4.1+20220908.d668787c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220902.dceb5b92/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.1+20220908.d668787c/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.1+20220902.dceb5b92/.github/workflows/crmsh-ci.yml
2022-09-02 08:33:58.0 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/.github/workflows/crmsh-ci.yml
2022-09-08 08:15:31.0 +0200
@@ -16,6 +16,21 @@
TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
jobs:
+ general_check:
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v2
+- name: check data-manifest
+ run: |
+./update-data-manifest.sh
+output=`git --no-pager diff data-manifest`
+[[ -z $output ]] || {
+echo "$output"
+echo "A new version of data-manifest is needed."
+echo "Please run ./update-data-manifest.sh && git add
./data-manifest in your local environment and push the code again."
+exit 1
+}
+
unit_test:
runs-on: ubuntu-latest
strategy:
@@ -179,7 +194,8 @@
$DOCKER_SCRIPT 14
delivery:
-needs: [unit_test,
+needs: [general_check,
+ unit_test,
functional_test_crm_report_bugs,
functional_test_bootstrap_bugs,
functional_test_bootstrap_common,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220902.dceb5b92/crmsh/bootstrap.py
new/crmsh-4.4.1+20220908.d668787c/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220902.dceb5b92/crmsh/bootstrap.py2022-09-02
08:33:58.0 +0200
+++ new/crmsh-4.4.1+20220908.d668787c/crmsh/bootstrap.py2022-09-08
08:15:31.0 +0200
@@ -66,7 +66,7 @@
"/etc/drbd.conf", "/etc/drbd.d", "/etc/ha.d/ldirectord.cf",
"/etc/lvm/lvm.conf", "/etc/multipath.conf",
"/etc/samba/smb.conf", SYSCONFIG_NFS, SYSCONFIG_PCMK, SYSCONFIG_SBD,
PCMK_REMOTE_AUTH, WATCHDOG_CFG,
PROFILES_FILE, CRM_CFG, SBD_SYSTEMD_DELAY_START_DIR)
-INIT_STAGES = ("ssh", "ssh_remote", "csync2", "csync2_remote", "corosync",
"sbd", "cluster", "ocfs2", "admin",
commit crmsh for openSUSE:Factory
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-09-02 21:56:43
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Fri Sep 2 21:56:43 2022 rev:255 rq:1000825 version:4.4.1+20220902.dceb5b92
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-08-30
14:51:24.196414872 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-09-02
21:57:06.096377604 +0200
@@ -1,0 +2,12 @@
+Fri Sep 02 06:51:37 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220902.dceb5b92:
+ * Add SAN
+ * Apply proposed changes.
+ * Do not provide senceless default values for IPAddr2. Fix command line to
verify and setup cluster group.
+ * Fix typos
+ * Add documetation to the script
+ * move missplaced directory
+ * Initial version of cryptctl setup script.
+
+---
Old:
crmsh-4.4.1+20220830.5a63c85f.tar.bz2
New:
crmsh-4.4.1+20220902.dceb5b92.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.WLzbcq/_old 2022-09-02 21:57:06.628378891 +0200
+++ /var/tmp/diff_new_pack.WLzbcq/_new 2022-09-02 21:57:06.632378901 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220830.5a63c85f
+Version:4.4.1+20220902.dceb5b92
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.WLzbcq/_old 2022-09-02 21:57:06.676379006 +0200
+++ /var/tmp/diff_new_pack.WLzbcq/_new 2022-09-02 21:57:06.680379017 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 5a63c85f3d0e2e2d1bb3407fb4de7e0b4e9a8144
+ 051a68726275e7f61ba85da01354fd4536ac746f
(No newline at EOF)
++ crmsh-4.4.1+20220830.5a63c85f.tar.bz2 ->
crmsh-4.4.1+20220902.dceb5b92.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.1+20220830.5a63c85f/scripts/cryptctl/README.md
new/crmsh-4.4.1+20220902.dceb5b92/scripts/cryptctl/README.md
--- old/crmsh-4.4.1+20220830.5a63c85f/scripts/cryptctl/README.md
1970-01-01 01:00:00.0 +0100
+++ new/crmsh-4.4.1+20220902.dceb5b92/scripts/cryptctl/README.md
2022-09-02 08:33:58.0 +0200
@@ -0,0 +1,56 @@
+# cryptctl
+
+## Intorducion
+
+The cryptctl server daemon provides a LUKS-based disk encryption. This script
aims to setup an HA environment for the cryptctl-server
+
+## Prerequsits
+
+The cryptctl server needs following resources
+
+* /etc/sysconfig/cryptctl-server The configuration of the server. This will be
created once the server was setup and will be only modified if the
configuration will be changed like changing the administrator password. It is
sufficient to copy this file to all nodes when the cluster will be created.
+* The server certificate files in the directory /etc/cryptctl/servertls/. The
content of this directory will not be changed until the certifcates are valid.
It is sufficient to copy these files to all nodes when the cluster will be
created.
+* /var/lib/cryptctl/keydb The content of this directory must be provided on
shared storage like SAN NAS or NFS server. The encryption keys will be saved
here. For these directory a Filesystem resource agent will be created.
+* An IP address the cryptctl-server is listening on. An IPAddr2 resource agent
will be created for this reason.
+
+## Setup
+
+### Setp cryptctl server
+As first step you have to setup the cryptctl server:
+```shell
+cryptctl init-server
+```
+
+### Create a basic cluster
+If not already done you have to setup a basic cluster with at last two nodes.
It is very important that Node1 must be the server where you have confiugred
the cryptctl server.
+
+```shell
+crm cluster init -i -A -n -y
+```
+
+Join the cluster from other nodes:
+```shell
+ssh
+crm cluster join -y
+```
+
+### Setup the resource group for the cryptctl server
+
+You can setup all needed resource agents and copy all files to all nodes whit
the cryptcl crm-shell-script in one step. It is scrictly recommended to verify
the setup in first step:
+
+```shell
+crm script verify cryptctl \
+ cert-path= \
+ cert-key-path=
\
+ virtual-ip:ip= \
+ filesystem:device=
+```
+
+If the check was succesfull you have to setup the cluster group by running the
script:
+```shell
+crm script run cryptctl \
+
commit crmsh for openSUSE:Factory
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-08-30 14:50:39
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Tue Aug 30 14:50:39 2022 rev:254 rq:1000191 version:4.4.1+20220830.5a63c85f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-08-23
14:30:17.807694134 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-08-30
14:51:24.196414872 +0200
@@ -1,0 +2,22 @@
+Tue Aug 30 08:19:38 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220830.5a63c85f:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: bootstrap: Show remote node name when stopping service remotely
+
+---
+Mon Aug 29 07:35:53 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220829.08a730cb:
+ * Dev: log: print a full-width progress bar in status_progress to prevent
interleaving with log messages
+ * Dev: log: print begin and end marker in different lines in status_long
+
+---
+Wed Aug 24 09:20:14 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220824.c59544bf:
+ * Dev: ui_context: remove duplicated codes
+ * Dev: parallax: Add LogLevel=error ssh option to filter out warnings
(bsc#1196726)
+ * Revert "Fix: utils: Only raise exception when return code of systemctl
command over ssh larger than 4 (bsc#1196726)" (bsc#1202655)
+
+---
Old:
crmsh-4.4.1+20220822.c2f5d204.tar.bz2
New:
crmsh-4.4.1+20220830.5a63c85f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.JV6RKf/_old 2022-08-30 14:51:24.832416494 +0200
+++ /var/tmp/diff_new_pack.JV6RKf/_new 2022-08-30 14:51:24.840416515 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220822.c2f5d204
+Version:4.4.1+20220830.5a63c85f
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.JV6RKf/_old 2022-08-30 14:51:24.892416648 +0200
+++ /var/tmp/diff_new_pack.JV6RKf/_new 2022-08-30 14:51:24.896416658 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 1be81833f51a3d83b3329085cec5ab19f1957ef4
+ 5a63c85f3d0e2e2d1bb3407fb4de7e0b4e9a8144
(No newline at EOF)
++ crmsh-4.4.1+20220822.c2f5d204.tar.bz2 ->
crmsh-4.4.1+20220830.5a63c85f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/bootstrap.py
new/crmsh-4.4.1+20220830.5a63c85f/crmsh/bootstrap.py
--- old/crmsh-4.4.1+20220822.c2f5d204/crmsh/bootstrap.py2022-08-22
07:51:44.0 +0200
+++ new/crmsh-4.4.1+20220830.5a63c85f/crmsh/bootstrap.py2022-08-30
10:02:28.0 +0200
@@ -361,20 +361,20 @@
"""
Wait for resource started
"""
-with logger_utils.status_long(message):
+with logger_utils.status_long(message) as progress_bar:
while True:
if xmlutil.CrmMonXmlParser.is_resource_started(resource):
break
-status_progress()
+status_progress(progress_bar)
sleep(1)
def wait_for_cluster():
-with logger_utils.status_long("Waiting for cluster"):
+with logger_utils.status_long("Waiting for cluster") as progress_bar:
while True:
if is_online():
break
-status_progress()
+status_progress(progress_bar)
sleep(2)
@@ -438,10 +438,9 @@
time.sleep(t)
-def status_progress():
+def status_progress(progress_bar):
if not _context or not _context.quiet:
-sys.stdout.write(".")
-sys.stdout.flush()
+progress_bar.progress()
def partprobe():
@@ -1873,7 +1872,7 @@
"""
for service in stop_list:
if utils.service_is_active(service, remote_addr=remote_addr):
-logger.info("Stopping the {}".format(service))
+logger.info("Stopping the %s%s", service, " on
{}".format(remote_addr) if remote_addr else "")
utils.stop_service(service, disable=True, remote_addr=remote_addr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220822.c2f5d204/crmsh/log.py
new/crmsh-4.4.1+20220830.5a63c85f/crmsh/log.py
---
commit crmsh for openSUSE:Factory
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-08-23 14:29:54
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2083 (New)
Package is "crmsh"
Tue Aug 23 14:29:54 2022 rev:253 rq:998748 version:4.4.1+20220822.c2f5d204
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-08-11
18:33:15.822202830 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2083/crmsh.changes2022-08-23
14:30:17.807694134 +0200
@@ -1,0 +2,19 @@
+Tue Aug 23 01:26:47 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220822.c2f5d204:
+ * fix: configure: refresh cib before showing or modifying if no pending
changes has been made (bsc#1202465)
+
+---
+Mon Aug 22 02:01:36 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220822.10c65b3b:
+ * Revert "Dev: testcases: Update expected testcase with pacemaker update"
+ * Dev: CI: master branch change to use opensuse/leap:15.4 as docker image
+
+---
+Fri Aug 12 08:25:29 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220812.5acffe48:
+ * Dev: behave: Increase wait time for resource started
+
+---
Old:
crmsh-4.4.1+20220811.e3a59fc7.tar.bz2
New:
crmsh-4.4.1+20220822.c2f5d204.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.BL7B31/_old 2022-08-23 14:30:20.683700146 +0200
+++ /var/tmp/diff_new_pack.BL7B31/_new 2022-08-23 14:30:20.687700154 +0200
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.1+20220811.e3a59fc7
+Version:4.4.1+20220822.c2f5d204
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.BL7B31/_old 2022-08-23 14:30:20.727700238 +0200
+++ /var/tmp/diff_new_pack.BL7B31/_new 2022-08-23 14:30:20.731700246 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- e3a59fc7fda76339197455c477df102048ede726
+ 1be81833f51a3d83b3329085cec5ab19f1957ef4
(No newline at EOF)
++ crmsh-4.4.1+20220811.e3a59fc7.tar.bz2 ->
crmsh-4.4.1+20220822.c2f5d204.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/Dockerfile
new/crmsh-4.4.1+20220822.c2f5d204/Dockerfile
--- old/crmsh-4.4.1+20220811.e3a59fc7/Dockerfile2022-08-11
13:53:08.0 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/Dockerfile2022-08-22
07:51:44.0 +0200
@@ -1,12 +1,12 @@
-FROM opensuse/tumbleweed
+FROM opensuse/leap:15.4
MAINTAINER Xin Liang
ARG ssh_prv_key
ARG ssh_pub_key
-# docker build -t hatbw --build-arg ssh_prv_key="$(cat /root/.ssh/id_rsa)"
--build-arg ssh_pub_key="$(cat /root/.ssh/id_rsa.pub)" .
+# docker build -t haleap --build-arg ssh_prv_key="$(cat /root/.ssh/id_rsa)"
--build-arg ssh_pub_key="$(cat /root/.ssh/id_rsa.pub)" .
# docker login
-# docker tag hatbw liangxin1300/hatbw
-# docker push liangxin1300/hatbw
+# docker tag haleap liangxin1300/haleap:15.4
+# docker push liangxin1300/haleap:15.4
RUN zypper ref
RUN zypper -n install systemd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/cibconfig.py
new/crmsh-4.4.1+20220822.c2f5d204/crmsh/cibconfig.py
--- old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/cibconfig.py2022-08-11
13:53:08.0 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/crmsh/cibconfig.py2022-08-22
07:51:44.0 +0200
@@ -3254,6 +3254,10 @@
return False
return self.modified_elems() or self.remove_queue
+def ensure_cib_updated(self):
+if options.interactive and not self.has_cib_changed():
+self.refresh()
+
def _verify_constraints(self, node):
'''
Check if all resources referenced in a constraint exist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/ui_configure.py
new/crmsh-4.4.1+20220822.c2f5d204/crmsh/ui_configure.py
--- old/crmsh-4.4.1+20220811.e3a59fc7/crmsh/ui_configure.py 2022-08-11
13:53:08.0 +0200
+++ new/crmsh-4.4.1+20220822.c2f5d204/crmsh/ui_configure.py 2022-08-22
07:51:44.0 +0200
@@ -514,6 +514,7 @@
@command.name('_test')
@command.skill_level('administrator')
def
commit crmsh for openSUSE:Factory
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-08-11 18:33:00
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1521 (New)
Package is "crmsh"
Thu Aug 11 18:33:00 2022 rev:252 rq:994557 version:4.4.1+20220811.e3a59fc7
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-08-09
15:28:31.477654716 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1521/crmsh.changes2022-08-11
18:33:15.822202830 +0200
@@ -1,0 +2,13 @@
+Thu Aug 11 12:09:28 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.1+20220811.e3a59fc7:
+ * Fix: bootstrap: Use crmsh.parallax instead of parallax module directly
(bsc#1202006)
+
+---
+Wed Aug 10 15:00:30 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220810.387d071f:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: bootstrap: Generate public key from private key
+
+---
Old:
crmsh-4.4.0+20220809.4f90c4ef.tar.bz2
New:
crmsh-4.4.1+20220811.e3a59fc7.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.QDkANo/_old 2022-08-11 18:33:16.366201995 +0200
+++ /var/tmp/diff_new_pack.QDkANo/_new 2022-08-11 18:33:16.370201989 +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+20220809.4f90c4ef
+Version:4.4.1+20220811.e3a59fc7
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.QDkANo/_old 2022-08-11 18:33:16.398201946 +0200
+++ /var/tmp/diff_new_pack.QDkANo/_new 2022-08-11 18:33:16.402201940 +0200
@@ -3,7 +3,7 @@
https://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.4.0+%cd.%h
+4.4.1+%cd.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.QDkANo/_old 2022-08-11 18:33:16.418201916 +0200
+++ /var/tmp/diff_new_pack.QDkANo/_new 2022-08-11 18:33:16.418201916 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 4f90c4ef75b4d6d3e4d3d11ec94eead2e5619172
+ e3a59fc7fda76339197455c477df102048ede726
(No newline at EOF)
++ crmsh-4.4.0+20220809.4f90c4ef.tar.bz2 ->
crmsh-4.4.1+20220811.e3a59fc7.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220809.4f90c4ef/crmsh/bootstrap.py
new/crmsh-4.4.1+20220811.e3a59fc7/crmsh/bootstrap.py
--- old/crmsh-4.4.0+20220809.4f90c4ef/crmsh/bootstrap.py2022-08-09
08:47:48.0 +0200
+++ new/crmsh-4.4.1+20220811.e3a59fc7/crmsh/bootstrap.py2022-08-11
13:53:08.0 +0200
@@ -35,6 +35,7 @@
from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT,
REJOIN_COUNT, REJOIN_INTERVAL
from . import ocfs2
from . import qdevice
+from . import parallax
from . import log
@@ -828,10 +829,14 @@
"""
change_user_shell(user)
+cmd = ""
private_key, public_key, authorized_file = key_files(user).values()
if not utils.detect_file(private_key, remote=remote):
logger.info("SSH key for {} does not exist, hence generate it
now".format(user))
cmd = "ssh-keygen -q -f {} -C 'Cluster Internal on {}' -N
''".format(private_key, remote if remote else utils.this_node())
+elif not utils.detect_file(public_key, remote=remote):
+cmd = "ssh-keygen -y -f {} > {}".format(private_key, public_key)
+if cmd:
cmd = utils.add_su(cmd, user)
utils.get_stdout_or_raise_error(cmd, remote=remote)
@@ -1495,6 +1500,9 @@
def join_ssh_merge(_cluster_node):
+"""
+Ensure known_hosts is the same in all nodes
+"""
logger.info("Merging known_hosts")
hosts = [m.group(1)
@@ -1503,22 +1511,14 @@
hosts = [_cluster_node]
logger.warning("Unable to extract host list from %s" % (CSYNC2_CFG))
-try:
-import parallax
-except ImportError:
-utils.fatal("parallax python library is missing")
-
-opts = parallax.Options()
-opts.ssh_options = ['StrictHostKeyChecking=no']
-
-# The act of using pssh to connect to every host (without strict host key
-# checking) ensures that at least *this* host has every other host in its
-# known_hosts
+# To create local entry in known_hosts
+utils.get_stdout_or_raise_error("ssh {} {} true".format(SSH_OPTION,
utils.this_node()))
+
known_hosts_new = set()
cat_cmd = "[ -e
commit crmsh for openSUSE:Factory
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-08-09 15:27:59
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1521 (New)
Package is "crmsh"
Tue Aug 9 15:27:59 2022 rev:251 rq:993920 version:4.4.0+20220809.4f90c4ef
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-07-28
20:59:30.275714523 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1521/crmsh.changes2022-08-09
15:28:31.477654716 +0200
@@ -1,0 +2,12 @@
+Tue Aug 09 07:05:44 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220809.4f90c4ef:
+ * Dev: bootstrap: Don't sync csync2 when peer node's csync2 service not ready
+
+---
+Mon Aug 08 15:04:45 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220808.89fa84a6:
+ * Dev: bootstrap: Don't open mgmt port since it's deprecated
+
+---
Old:
crmsh-4.4.0+20220728.3f249756.tar.bz2
New:
crmsh-4.4.0+20220809.4f90c4ef.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.x4Td9w/_old 2022-08-09 15:28:32.005656224 +0200
+++ /var/tmp/diff_new_pack.x4Td9w/_new 2022-08-09 15:28:32.013656247 +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+20220728.3f249756
+Version:4.4.0+20220809.4f90c4ef
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.x4Td9w/_old 2022-08-09 15:28:32.061656384 +0200
+++ /var/tmp/diff_new_pack.x4Td9w/_new 2022-08-09 15:28:32.065656396 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 3f249756dbcd5c5d2548e27b992df76cd3b38cb4
+ 4f90c4ef75b4d6d3e4d3d11ec94eead2e5619172
(No newline at EOF)
++ crmsh-4.4.0+20220728.3f249756.tar.bz2 ->
crmsh-4.4.0+20220809.4f90c4ef.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220728.3f249756/crmsh/bootstrap.py
new/crmsh-4.4.0+20220809.4f90c4ef/crmsh/bootstrap.py
--- old/crmsh-4.4.0+20220728.3f249756/crmsh/bootstrap.py2022-07-28
09:57:44.0 +0200
+++ new/crmsh-4.4.0+20220809.4f90c4ef/crmsh/bootstrap.py2022-08-09
08:47:48.0 +0200
@@ -618,9 +618,9 @@
def firewall_open_basic_ports():
"""
-Open ports for csync2, mgmtd, hawk & dlm respectively
+Open ports for csync2, hawk & dlm respectively
"""
-configure_firewall(tcp=["30865", "5560", "7630", "21064"])
+configure_firewall(tcp=["30865", "7630", "21064"])
def firewall_open_corosync_ports():
@@ -951,7 +951,6 @@
if not re.search(r"^\s*host.*\s+%s\s*;" % (newhost), curr_cfg,
flags=re.M):
curr_cfg = re.sub(r"\bhost.*\s+\S+\s*;", r"\g<0>\n\thost %s;" %
(utils.doublequote(newhost)), curr_cfg, count=1)
utils.str2file(curr_cfg, CSYNC2_CFG)
-csync2_update("/")
else:
logger_utils.log_only_to_file(": Not updating %s - remote host %s
already exists" % (CSYNC2_CFG, newhost))
finally:
commit crmsh for openSUSE:Factory
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-07-28 20:59:04
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1533 (New)
Package is "crmsh"
Thu Jul 28 20:59:04 2022 rev:250 rq:991514 version:4.4.0+20220728.3f249756
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-07-22
19:21:31.784689089 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1533/crmsh.changes2022-07-28
20:59:30.275714523 +0200
@@ -1,0 +2,12 @@
+Thu Jul 28 08:14:15 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220728.3f249756:
+ * Dev: ui_cluster: Change the dest of -N option as node_list
+ * Update crmsh/ui_cluster.py
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: behave: adjust functional test based on previous changes
+ * Dev: doc: remove cluster add in doc
+ * Dev: bootstrap: remove cluster add sub-command
+ * Fix: bootstrap: -N option setup the current node and peers all together
(bsc#1175863)
+
+---
Old:
crmsh-4.4.0+20220711.573ebb98.tar.bz2
New:
crmsh-4.4.0+20220728.3f249756.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.xb5now/_old 2022-07-28 20:59:30.795715988 +0200
+++ /var/tmp/diff_new_pack.xb5now/_new 2022-07-28 20:59:30.803716010 +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+20220711.573ebb98
+Version:4.4.0+20220728.3f249756
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.xb5now/_old 2022-07-28 20:59:30.867716191 +0200
+++ /var/tmp/diff_new_pack.xb5now/_new 2022-07-28 20:59:30.871716201 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 573ebb9879786925d04ce19017e06179936d833d
+ 3f249756dbcd5c5d2548e27b992df76cd3b38cb4
(No newline at EOF)
++ crmsh-4.4.0+20220711.573ebb98.tar.bz2 ->
crmsh-4.4.0+20220728.3f249756.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220711.573ebb98/crmsh/bootstrap.py
new/crmsh-4.4.0+20220728.3f249756/crmsh/bootstrap.py
--- old/crmsh-4.4.0+20220711.573ebb98/crmsh/bootstrap.py2022-07-11
08:41:22.0 +0200
+++ new/crmsh-4.4.0+20220728.3f249756/crmsh/bootstrap.py2022-07-28
09:57:44.0 +0200
@@ -86,7 +86,8 @@
self.cluster_name = None
self.watchdog = None
self.no_overwrite_sshkey = None
-self.nic_list = None
+self.nic_list = []
+self.node_list = []
self.unicast = None
self.multicast = None
self.admin_ip = None
@@ -111,7 +112,7 @@
self.clusters = None
self.tickets = None
self.sbd_manager = None
-self.sbd_devices = None
+self.sbd_devices = []
self.diskless_sbd = None
self.stage = None
self.args = None
@@ -167,6 +168,21 @@
if self.cluster_is_running:
utils.check_all_nodes_reachable()
+def _validate_nodes_option(self):
+"""
+Validate -N/--nodes option
+"""
+self.node_list = utils.parse_append_action_argument(self.node_list)
+me = utils.this_node()
+if me in self.node_list:
+self.node_list.remove(me)
+if self.node_list and self.stage:
+utils.fatal("Can't use -N/--nodes option and stage({})
together".format(self.stage))
+if utils.has_dup_value(self.node_list):
+utils.fatal("Duplicated input for -N/--nodes option")
+for node in self.node_list:
+utils.ping_node(node)
+
def validate_option(self):
"""
Validate options
@@ -178,14 +194,15 @@
if self.nic_list:
if len(self.nic_list) > 2:
utils.fatal("Maximum number of interface is 2")
-if len(self.nic_list) != len(set(self.nic_list)):
-utils.fatal("Duplicated input")
+if utils.has_dup_value(self.nic_list):
+utils.fatal("Duplicated input for -i/--interface option")
if self.no_overwrite_sshkey:
logger.warning("--no-overwrite-sshkey option is deprecated since
crmsh does not overwrite ssh keys by default anymore and will be removed in
future versions")
if self.type == "join" and self.watchdog:
logger.warning("-w option is deprecated and will be removed in
future
commit crmsh for openSUSE:Factory
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-07-22 19:21:19
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.21925 (New)
Package is "crmsh"
Fri Jul 22 19:21:19 2022 rev:249 rq:990604 version:4.4.0+20220711.573ebb98
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-07-09
17:05:34.728930322 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.21925/crmsh.changes 2022-07-22
19:21:31.784689089 +0200
@@ -1,0 +2,6 @@
+Mon Jul 11 06:59:28 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220711.573ebb98:
+ * Dev: parallax: Add strict option to avoid raise exception when set to False
+
+---
Old:
crmsh-4.4.0+20220708.6ed6b56f.tar.bz2
New:
crmsh-4.4.0+20220711.573ebb98.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.BbupPH/_old 2022-07-22 19:21:32.228689775 +0200
+++ /var/tmp/diff_new_pack.BbupPH/_new 2022-07-22 19:21:32.232689781 +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+20220708.6ed6b56f
+Version:4.4.0+20220711.573ebb98
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.BbupPH/_old 2022-07-22 19:21:32.264689831 +0200
+++ /var/tmp/diff_new_pack.BbupPH/_new 2022-07-22 19:21:32.268689837 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 6ed6b56f3466172c3375dd28ff68492d18bebcb8
+ 573ebb9879786925d04ce19017e06179936d833d
(No newline at EOF)
++ crmsh-4.4.0+20220708.6ed6b56f.tar.bz2 ->
crmsh-4.4.0+20220711.573ebb98.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220708.6ed6b56f/crmsh/parallax.py
new/crmsh-4.4.0+20220711.573ebb98/crmsh/parallax.py
--- old/crmsh-4.4.0+20220708.6ed6b56f/crmsh/parallax.py 2022-07-08
07:57:36.0 +0200
+++ new/crmsh-4.4.0+20220711.573ebb98/crmsh/parallax.py 2022-07-11
08:41:22.0 +0200
@@ -14,10 +14,11 @@
# slurp: Copies files from a set of remote hosts to local folders
"""
def __init__(self, nodes, cmd=None, localdir=None, filename=None,
- src=None, dst=None, askpass=False, ssh_options=None):
+src=None, dst=None, askpass=False, ssh_options=None, strict=True):
self.nodes = nodes
self.askpass = askpass
self.ssh_options = ssh_options
+self.strict = strict
# used for call
self.cmd = cmd
@@ -45,7 +46,9 @@
def handle(self, results):
for host, result in results:
if isinstance(result, parallax.Error):
-raise ValueError("Failed on {}: {}".format(host, result))
+exception_str = "Failed on {}: {}".format(host, result)
+if self.strict:
+raise ValueError(exception_str)
return results
def call(self):
@@ -62,7 +65,7 @@
return self.handle(list(results.items()))
-def parallax_call(nodes, cmd, askpass=False, ssh_options=None):
+def parallax_call(nodes, cmd, askpass=False, ssh_options=None, strict=True):
"""
Executes the given command on a set of hosts, collecting the output
nodes: a set of hosts
@@ -71,11 +74,11 @@
ssh_options: Extra options to pass to SSH
Returns [(host, (rc, stdout, stdin)), ...] or ValueError exception
"""
-p = Parallax(nodes, cmd=cmd, askpass=askpass, ssh_options=ssh_options)
+p = Parallax(nodes, cmd=cmd, askpass=askpass, ssh_options=ssh_options,
strict=strict)
return p.call()
-def parallax_slurp(nodes, localdir, filename, askpass=False, ssh_options=None):
+def parallax_slurp(nodes, localdir, filename, askpass=False, ssh_options=None,
strict=True):
"""
Copies from the remote node to the local node
nodes: a set of hosts
@@ -86,11 +89,11 @@
Returns [(host, (rc, stdout, stdin, localpath)), ...] or ValueError
exception
"""
p = Parallax(nodes, localdir=localdir, filename=filename,
- askpass=askpass, ssh_options=ssh_options)
+askpass=askpass, ssh_options=ssh_options, strict=strict)
return p.slurp()
-def parallax_copy(nodes, src, dst, askpass=False, ssh_options=None):
+def parallax_copy(nodes, src, dst, askpass=False, ssh_options=None,
strict=True):
"""
Copies from the local node to a set of remote hosts
nodes: a set of hosts
commit crmsh for openSUSE:Factory
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-07-09 17:03:18
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1523 (New)
Package is "crmsh"
Sat Jul 9 17:03:18 2022 rev:248 rq:987936 version:4.4.0+20220708.6ed6b56f
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-07-08
14:02:58.738520674 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1523/crmsh.changes2022-07-09
17:05:34.728930322 +0200
@@ -1,0 +2,6 @@
+Fri Jul 08 06:15:31 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220708.6ed6b56f:
+ * Fix: utils: use -o and -n to compare files instead of strings for crm_diff
(bsc#1201312)
+
+---
Old:
crmsh-4.4.0+20220705.bb8708eb.tar.bz2
New:
crmsh-4.4.0+20220708.6ed6b56f.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.S5POGu/_old 2022-07-09 17:05:35.212930781 +0200
+++ /var/tmp/diff_new_pack.S5POGu/_new 2022-07-09 17:05:35.216930785 +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+20220705.bb8708eb
+Version:4.4.0+20220708.6ed6b56f
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.S5POGu/_old 2022-07-09 17:05:35.272930838 +0200
+++ /var/tmp/diff_new_pack.S5POGu/_new 2022-07-09 17:05:35.276930841 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- bb8708ebfe5eb3710295e26594f81642107779b6
+ 6ed6b56f3466172c3375dd28ff68492d18bebcb8
(No newline at EOF)
++ crmsh-4.4.0+20220705.bb8708eb.tar.bz2 ->
crmsh-4.4.0+20220708.6ed6b56f.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220705.bb8708eb/crmsh/utils.py
new/crmsh-4.4.0+20220708.6ed6b56f/crmsh/utils.py
--- old/crmsh-4.4.0+20220705.bb8708eb/crmsh/utils.py2022-07-05
03:37:20.0 +0200
+++ new/crmsh-4.4.0+20220708.6ed6b56f/crmsh/utils.py2022-07-08
07:57:36.0 +0200
@@ -3077,7 +3077,13 @@
"""
# In cibconfig.py, _patch_cib method doesn't include status section
# So here should make a function to handle common cases
-cmd = "crm_diff -u -O '{}' -N '{}'".format(orig_cib_str, current_cib_str)
+from . import tmpfiles
+orig_cib_file = str2tmp(orig_cib_str, suffix=".xml")
+current_cib_file = str2tmp(current_cib_str, suffix=".xml")
+tmpfiles.add(orig_cib_file)
+tmpfiles.add(current_cib_file)
+
+cmd = "crm_diff -u -o '{}' -n '{}'".format(orig_cib_file, current_cib_file)
rc, cib_diff, err = get_stdout_stderr(cmd)
if rc == 0: # no difference
return True
commit crmsh for openSUSE:Factory
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-07-08 14:02:57
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1523 (New)
Package is "crmsh"
Fri Jul 8 14:02:57 2022 rev:247 rq:987771 version:4.4.0+20220705.bb8708eb
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-06-23
10:24:59.591787114 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1523/crmsh.changes2022-07-08
14:02:58.738520674 +0200
@@ -1,0 +2,19 @@
+Tue Jul 05 01:54:44 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220705.bb8708eb:
+ * Dev: CI: trigger CI on push and pull request for all branches
+
+---
+Fri Jun 24 03:12:49 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220624.7b89db34:
+ * Dev: log: Add replacement fields in str format
+
+---
+Thu Jun 23 08:39:09 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220623.6b256b4b:
+ * Dev: behave: adjust functional test based on previous changes
+ * Dev: ui_cluster: Add examples for 'cluster init' and 'cluster join'
+
+---
Old:
crmsh-4.4.0+20220619.cc0a81a5.tar.bz2
New:
crmsh-4.4.0+20220705.bb8708eb.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Z4Hcbd/_old 2022-07-08 14:02:59.222521250 +0200
+++ /var/tmp/diff_new_pack.Z4Hcbd/_new 2022-07-08 14:02:59.226521255 +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+20220619.cc0a81a5
+Version:4.4.0+20220705.bb8708eb
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Z4Hcbd/_old 2022-07-08 14:02:59.262521298 +0200
+++ /var/tmp/diff_new_pack.Z4Hcbd/_new 2022-07-08 14:02:59.262521298 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 89c52154626a931106a7967865f7d5d9793ea1bf
+ bb8708ebfe5eb3710295e26594f81642107779b6
(No newline at EOF)
++ crmsh-4.4.0+20220619.cc0a81a5.tar.bz2 ->
crmsh-4.4.0+20220705.bb8708eb.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220619.cc0a81a5/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.0+20220705.bb8708eb/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.0+20220619.cc0a81a5/.github/workflows/crmsh-ci.yml
2022-06-19 05:16:07.0 +0200
+++ new/crmsh-4.4.0+20220705.bb8708eb/.github/workflows/crmsh-ci.yml
2022-07-05 03:37:20.0 +0200
@@ -4,11 +4,7 @@
name: crmsh CI
-on:
- push:
-branches: [ master ]
- pull_request:
-branches: [ master ]
+on: [push, pull_request]
env:
DOCKER_SCRIPT: ./test/run-functional-tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220619.cc0a81a5/crmsh/log.py
new/crmsh-4.4.0+20220705.bb8708eb/crmsh/log.py
--- old/crmsh-4.4.0+20220619.cc0a81a5/crmsh/log.py 2022-06-19
05:16:07.0 +0200
+++ new/crmsh-4.4.0+20220705.bb8708eb/crmsh/log.py 2022-07-05
03:37:20.0 +0200
@@ -202,7 +202,7 @@
if getattr(h, '_name') == _type:
return h
else:
-raise ValueError("Failed to find \"\" handler in logger
\"\"".format(_type, self.logger.name))
+raise ValueError("Failed to find \"{}\" handler in logger
\"{}\"".format(_type, self.logger.name))
def disable_info_in_console(self):
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220619.cc0a81a5/crmsh/ui_cluster.py
new/crmsh-4.4.0+20220705.bb8708eb/crmsh/ui_cluster.py
--- old/crmsh-4.4.0+20220619.cc0a81a5/crmsh/ui_cluster.py 2022-06-19
05:16:07.0 +0200
+++ new/crmsh-4.4.0+20220705.bb8708eb/crmsh/ui_cluster.py 2022-07-05
03:37:20.0 +0200
@@ -292,6 +292,41 @@
Note:
- If stage is not specified, the script will run through each stage
in sequence, with prompts for required information.
+
+Examples:
+ # Setup the cluster on the current node
+ crm cluster init -y
+
+ # Setup the cluster with multiple nodes
+ (NOTE: the current node will be part of the cluster even not listed in the
-N option as below)
+ crm cluster init -N node1 -N node2 -N node3 -y
+
+ # Setup the cluster on the current node, with two network interfaces
+ crm cluster init
commit crmsh for openSUSE:Factory
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-23 10:24:16
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1548 (New)
Package is "crmsh"
Thu Jun 23 10:24:16 2022 rev:246 rq:984403 version:4.4.0+20220619.cc0a81a5
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-06-01
17:35:15.202782726 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1548/crmsh.changes2022-06-23
10:24:59.591787114 +0200
@@ -1,0 +2,19 @@
+Sun Jun 19 03:32:41 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220619.cc0a81a5:
+ * Dev: CI: Run delivery and submit stage only at ClusterLabs/crmsh repo
+
+---
+Tue Jun 14 03:32:25 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220614.f76fee26:
+ * Dev: doc: add help info for related: prefix for 'configure show' command
+ * Dev: cinconfig: enable "related:" prefix to show the objects by given ra
type
+
+---
+Fri Jun 10 02:17:56 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220610.16cc8d68:
+ * Fix: crm report: use sudo when under non root and hacluster user
(bsc#1199634)
+
+---
Old:
crmsh-4.4.0+20220601.b8c2952f.tar.bz2
New:
crmsh-4.4.0+20220619.cc0a81a5.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.shgKSa/_old 2022-06-23 10:25:00.067787631 +0200
+++ /var/tmp/diff_new_pack.shgKSa/_new 2022-06-23 10:25:00.079787644 +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+20220601.b8c2952f
+Version:4.4.0+20220619.cc0a81a5
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.shgKSa/_old 2022-06-23 10:25:00.123787692 +0200
+++ /var/tmp/diff_new_pack.shgKSa/_new 2022-06-23 10:25:00.127787697 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- b8c2952f150185a722fcbbe3f69a9c917d0ed5f1
+ 89c52154626a931106a7967865f7d5d9793ea1bf
(No newline at EOF)
++ crmsh-4.4.0+20220601.b8c2952f.tar.bz2 ->
crmsh-4.4.0+20220619.cc0a81a5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220601.b8c2952f/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.0+20220619.cc0a81a5/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.0+20220601.b8c2952f/.github/workflows/crmsh-ci.yml
2022-06-01 04:19:41.0 +0200
+++ new/crmsh-4.4.0+20220619.cc0a81a5/.github/workflows/crmsh-ci.yml
2022-06-19 05:16:07.0 +0200
@@ -202,7 +202,7 @@
steps:
- uses: actions/checkout@v2
- name: delivery process
- if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+ if: github.repository == 'ClusterLabs/crmsh' && github.ref ==
'refs/heads/master' && github.event_name == 'push'
run: |
docker pull shap/continuous_deliver:latest
docker run -t -v "$(pwd):/package" \
@@ -221,7 +221,7 @@
steps:
- uses: actions/checkout@v2
- name: submit process
- if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+ if: github.repository == 'ClusterLabs/crmsh' && github.ref ==
'refs/heads/master' && github.event_name == 'push'
run: |
docker pull shap/continuous_deliver:latest
docker run -t -v "$(pwd):/package" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220601.b8c2952f/crmsh/cibconfig.py
new/crmsh-4.4.0+20220619.cc0a81a5/crmsh/cibconfig.py
--- old/crmsh-4.4.0+20220601.b8c2952f/crmsh/cibconfig.py2022-06-01
04:19:41.0 +0200
+++ new/crmsh-4.4.0+20220619.cc0a81a5/crmsh/cibconfig.py2022-06-19
05:16:07.0 +0200
@@ -3135,6 +3135,31 @@
return [x for x in self.cib_objects
if x.updated or x.origin == "user"]
+def get_elems_on_ra_type(self, spec):
+"""
+Get elements by given ra class:provider:type or class:type or only type
+return [] if no results
+"""
+content_list = spec.split(':')[1:]
+if len(content_list) > 3:
+return []
+if len(content_list) == 3:
+cls, provider, tp = content_list
+return [x for x in self.cib_objects
+if x.node.get("type") == tp
+
commit crmsh for openSUSE:Factory
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.changes2022-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 @@
https://github.com/ClusterLabs/crmsh.git
- a3a0036532f5b37b6cc6b659f89ac9dcb08f2896
+ b8c2952f150185a722fcbbe3f69a9c917d0ed5f1
(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.py2022-05-05
03:52:21.0 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/crmsh/bootstrap.py2022-06-01
04:19:41.0 +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.0 +0200
+++ new/crmsh-4.4.0+20220601.b8c2952f/crmsh/ui_cluster.py 2022-06-01
04:19:41.0 +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
commit crmsh for openSUSE:Factory
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-05-05 23:06:47
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1538 (New)
Package is "crmsh"
Thu May 5 23:06:47 2022 rev:244 rq:975021 version:4.4.0+20220505.a3a00365
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-04-19
09:59:54.403692360 +0200
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1538/crmsh.changes2022-05-05
23:07:21.137629120 +0200
@@ -1,0 +2,7 @@
+Thu May 05 02:12:49 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220505.a3a00365:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: crm report: Read data in a save way, to avoid
UnicodeDecodeError(bsc#1198180)
+
+---
Old:
crmsh-4.4.0+20220418.cbf7a09e.tar.bz2
New:
crmsh-4.4.0+20220505.a3a00365.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.tlwU19/_old 2022-05-05 23:07:22.549630883 +0200
+++ /var/tmp/diff_new_pack.tlwU19/_new 2022-05-05 23:07:22.553630887 +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+20220418.cbf7a09e
+Version:4.4.0+20220505.a3a00365
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.tlwU19/_old 2022-05-05 23:07:22.597630943 +0200
+++ /var/tmp/diff_new_pack.tlwU19/_new 2022-05-05 23:07:22.597630943 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 682c8132161630cc4c2af4bc249c40f93d995bae
+ a3a0036532f5b37b6cc6b659f89ac9dcb08f2896
(No newline at EOF)
++ crmsh-4.4.0+20220418.cbf7a09e.tar.bz2 ->
crmsh-4.4.0+20220505.a3a00365.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220418.cbf7a09e/crmsh/corosync.py
new/crmsh-4.4.0+20220505.a3a00365/crmsh/corosync.py
--- old/crmsh-4.4.0+20220418.cbf7a09e/crmsh/corosync.py 2022-04-18
08:32:05.0 +0200
+++ new/crmsh-4.4.0+20220505.a3a00365/crmsh/corosync.py 2022-05-05
03:52:21.0 +0200
@@ -446,26 +446,22 @@
def get_all_paths():
-f = open(conf()).read()
-p = Parser(f)
+p = Parser(utils.read_from_file(conf()))
return p.all_paths()
def get_value(path):
-f = open(conf()).read()
-p = Parser(f)
+p = Parser(utils.read_from_file(conf()))
return p.get(path)
def get_values(path):
-f = open(conf()).read()
-p = Parser(f)
+p = Parser(utils.read_from_file(conf()))
return p.get_all(path)
def set_value(path, value):
-f = open(conf()).read()
-p = Parser(f)
+p = Parser(utils.read_from_file(conf()))
p.set(path, value)
utils.str2file(p.to_string(), conf())
@@ -479,9 +475,7 @@
find if the same IP already configured
If so, raise IPAlreadyConfiguredError
"""
-with open(conf()) as f:
-p = Parser(f.read())
-
+p = Parser(utils.read_from_file(conf()))
# get exist ip list from corosync.conf
corosync_iplist = []
for path in set(p.all_paths()):
@@ -509,9 +503,7 @@
find_configured_ip(ip_list)
-with open(conf()) as f:
-p = Parser(f.read())
-
+p = Parser(utils.read_from_file(conf()))
if node_id is None:
node_id = get_free_nodeid(p)
node_value = []
@@ -558,8 +550,7 @@
logger.warning("%s already in configuration" % (name))
return
-f = open(conf()).read()
-p = Parser(f)
+p = Parser(utils.read_from_file(conf()))
node_addr = addr
node_id = get_free_nodeid(p)
@@ -596,8 +587,7 @@
'''
Remove node from corosync
'''
-f = open(conf()).read()
-p = Parser(f)
+p = Parser(utils.read_from_file(conf()))
nth = p.remove_section_where('nodelist.node', 'ring0_addr', addr)
if nth == -1:
return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220418.cbf7a09e/crmsh/qdevice.py
new/crmsh-4.4.0+20220505.a3a00365/crmsh/qdevice.py
--- old/crmsh-4.4.0+20220418.cbf7a09e/crmsh/qdevice.py 2022-04-18
08:32:05.0 +0200
+++ new/crmsh-4.4.0+20220505.a3a00365/crmsh/qdevice.py 2022-05-05
03:52:21.0 +0200
@@ -543,9 +543,7 @@
"""
Write qdevice attributes to config file
"""
-with open(corosync.conf()) as f:
-p = corosync.Parser(f.read())
-
+p = corosync.Parser(utils.read_from_file(corosync.conf()))
commit crmsh for openSUSE:Factory
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-04-19 09:58:56
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1941 (New)
Package is "crmsh"
Tue Apr 19 09:58:56 2022 rev:243 rq:970675 version:4.4.0+20220418.cbf7a09e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-03-21
20:12:26.460465160 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1941/crmsh.changes2022-04-19
09:59:54.403692360 +0200
@@ -1,0 +2,10 @@
+Mon Apr 18 06:48:42 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220418.cbf7a09e:
+ * Dev: README: update README
+ * Dev: remove unused files
+ * Dev: behave: Change behave test files based on new added
"run-functional-tests"
+ * Dev: run-functional-tests: Add file run-functional-tests
+ * Dev: Dockerfile: Update Dockerfile used by crmsh CI for master branch
+
+---
Old:
crmsh-4.4.0+20220321.8cf6a9d1.tar.bz2
New:
crmsh-4.4.0+20220418.cbf7a09e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.i1e7fq/_old 2022-04-19 09:59:54.903693010 +0200
+++ /var/tmp/diff_new_pack.i1e7fq/_new 2022-04-19 09:59:54.907693015 +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+20220321.8cf6a9d1
+Version:4.4.0+20220418.cbf7a09e
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.i1e7fq/_old 2022-04-19 09:59:54.947693067 +0200
+++ /var/tmp/diff_new_pack.i1e7fq/_new 2022-04-19 09:59:54.947693067 +0200
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 8cf6a9d13af6496fdd384c18c54680ceb354b72d
+ 682c8132161630cc4c2af4bc249c40f93d995bae
(No newline at EOF)
++ crmsh-4.4.0+20220321.8cf6a9d1.tar.bz2 ->
crmsh-4.4.0+20220418.cbf7a09e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220321.8cf6a9d1/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.0+20220418.cbf7a09e/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.0+20220321.8cf6a9d1/.github/workflows/crmsh-ci.yml
2022-03-21 09:03:21.0 +0100
+++ new/crmsh-4.4.0+20220418.cbf7a09e/.github/workflows/crmsh-ci.yml
2022-04-18 08:32:05.0 +0200
@@ -11,7 +11,7 @@
branches: [ master ]
env:
- DOCKER_SCRIPT: ./test/docker_scripts.sh
+ DOCKER_SCRIPT: ./test/run-functional-tests
FOLDER: /package
PACKAGE_NAME: crmsh
OBS_USER: ${{ secrets.OBS_USER }}
@@ -50,8 +50,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT crm_report before_install
-$DOCKER_SCRIPT crm_report run bugs
+$DOCKER_SCRIPT 6
functional_test_bootstrap_bugs:
runs-on: ubuntu-latest
@@ -62,8 +61,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT bootstrap before_install
-$DOCKER_SCRIPT bootstrap run bugs
+$DOCKER_SCRIPT 1
functional_test_bootstrap_common:
runs-on: ubuntu-latest
@@ -74,8 +72,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT bootstrap before_install
-$DOCKER_SCRIPT bootstrap run init_join_remove
+$DOCKER_SCRIPT 2
functional_test_bootstrap_options:
runs-on: ubuntu-latest
@@ -86,8 +83,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT bootstrap before_install
-$DOCKER_SCRIPT bootstrap run options
+$DOCKER_SCRIPT 3
functional_test_qdevice_setup_remove:
runs-on: ubuntu-latest
@@ -98,8 +94,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
/etc/docker/daemon.json
sudo systemctl restart docker.service
-$DOCKER_SCRIPT qdevice before_install
-$DOCKER_SCRIPT qdevice run setup_remove
+$DOCKER_SCRIPT 9
functional_test_qdevice_options:
runs-on: ubuntu-latest
@@ -110,8 +105,7 @@
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee
commit crmsh for openSUSE:Factory
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-03-21 20:12:17
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.25692 (New)
Package is "crmsh"
Mon Mar 21 20:12:17 2022 rev:242 rq:963487 version:4.4.0+20220321.8cf6a9d1
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-03-07
17:47:05.87144 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.25692/crmsh.changes 2022-03-21
20:12:26.460465160 +0100
@@ -1,0 +2,33 @@
+Mon Mar 21 08:22:17 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220321.8cf6a9d1:
+ * Dev: Parametrize the log dir
+
+---
+Mon Mar 21 05:15:04 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220321.aa92b3f0:
+ * Dev: unittest: Add unit test for previous changes
+ * Dev: behave: Add functional test for the scenario one qnetd for multi
cluster
+ * Dev: ui_cluster: Check if qdevice can contribute vote
+ * Dev: qdevice: Improve remove qdevice process
+ * Dev: qdevice: Add lock to protect for the same cluster name
+ * Fix: qdevice: Add lock to protect init_db_on_qnetd function (bsc#1197323)
+ * Dev: qdevice: Consolidate qdevice related separate functions into
qdevice.QDevice class
+ * Dev: lock: Make lock.py more generic
+ * Dev: qdevice: Add cluster name suffix to qdevice-net-node.crq on qnet
+ * Dev: qdevice: remove askpass since it's unnecessary after passwordless
configured on qnetd
+
+---
+Mon Mar 21 04:21:47 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220321.fceabc07:
+ * Dev: utils: Remove duplicated debug message
+
+---
+Fri Mar 18 15:34:39 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220318.7f434a3b:
+ * medium: utils: update detect_cloud pattern for aws
+
+---
Old:
crmsh-4.4.0+20220307.347f815c.tar.bz2
New:
crmsh-4.4.0+20220321.8cf6a9d1.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.JLs1hg/_old 2022-03-21 20:12:27.120465819 +0100
+++ /var/tmp/diff_new_pack.JLs1hg/_new 2022-03-21 20:12:27.124465823 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.0+20220307.347f815c
+Version:4.4.0+20220321.8cf6a9d1
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.JLs1hg/_old 2022-03-21 20:12:27.168465867 +0100
+++ /var/tmp/diff_new_pack.JLs1hg/_new 2022-03-21 20:12:27.176465875 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 347f815c6565d0f8d8d5472a5640cfc1ce78ccb5
+ 8cf6a9d13af6496fdd384c18c54680ceb354b72d
(No newline at EOF)
++ crmsh-4.4.0+20220307.347f815c.tar.bz2 ->
crmsh-4.4.0+20220321.8cf6a9d1.tar.bz2 ++
2164 lines of diff (skipped)
commit crmsh for openSUSE:Factory
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-03-07 17:46:53
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1958 (New)
Package is "crmsh"
Mon Mar 7 17:46:53 2022 rev:241 rq:959760 version:4.4.0+20220307.347f815c
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-02-17
23:41:39.827700349 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1958/crmsh.changes2022-03-07
17:47:05.87144 +0100
@@ -1,0 +2,7 @@
+Mon Mar 07 01:18:29 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220307.347f815c:
+ * Dev: testcases: Update expected testcase with pacemaker update
+ * Fix: utils: Only raise exception when return code of systemctl command
over ssh larger than 4 (bsc#1196726)
+
+---
Old:
crmsh-4.4.0+20220217.b8f67f4e.tar.bz2
New:
crmsh-4.4.0+20220307.347f815c.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.LFLgr9/_old 2022-03-07 17:47:06.531116937 +0100
+++ /var/tmp/diff_new_pack.LFLgr9/_new 2022-03-07 17:47:06.535116935 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.0+20220217.b8f67f4e
+Version:4.4.0+20220307.347f815c
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.LFLgr9/_old 2022-03-07 17:47:06.599116916 +0100
+++ /var/tmp/diff_new_pack.LFLgr9/_new 2022-03-07 17:47:06.607116915 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- b8f67f4e0eb53af9396d854a8ab740460c70c7ce
+ 347f815c6565d0f8d8d5472a5640cfc1ce78ccb5
(No newline at EOF)
++ crmsh-4.4.0+20220217.b8f67f4e.tar.bz2 ->
crmsh-4.4.0+20220307.347f815c.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220217.b8f67f4e/crmsh/utils.py
new/crmsh-4.4.0+20220307.347f815c/crmsh/utils.py
--- old/crmsh-4.4.0+20220217.b8f67f4e/crmsh/utils.py2022-02-17
05:38:34.0 +0100
+++ new/crmsh-4.4.0+20220307.347f815c/crmsh/utils.py2022-03-07
02:03:08.0 +0100
@@ -2540,10 +2540,13 @@
elif self.remote_addr and self.remote_addr != this_node():
prompt_msg = "Run \"{}\" on {}".format(cmd, self.remote_addr)
rc, output, err = run_cmd_on_remote(cmd, self.remote_addr,
prompt_msg)
+# see "EXIT STATUS" in man systemctl
+if rc > 4:
+raise ValueError("Run \"{}\" error: {}".format(cmd, err))
else:
rc, output, err = get_stdout_stderr(cmd)
-if rc != 0 and err:
-raise ValueError("Run \"{}\" error: {}".format(cmd, err))
+if rc != 0 and err:
+raise ValueError("Run \"{}\" error: {}".format(cmd, err))
return rc == 0, output
@property
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220217.b8f67f4e/test/testcases/ra.exp
new/crmsh-4.4.0+20220307.347f815c/test/testcases/ra.exp
--- old/crmsh-4.4.0+20220217.b8f67f4e/test/testcases/ra.exp 2022-02-17
05:38:34.0 +0100
+++ new/crmsh-4.4.0+20220307.347f815c/test/testcases/ra.exp 2022-03-07
02:03:08.0 +0100
@@ -84,11 +84,9 @@
Use this to enable a random delay for fencing actions.
The overall delay is derived from this random delay value adding a static
delay so that the sum is kept below the maximum delay.
-pcmk_delay_base (time, [0s]): Enable a base delay for fencing actions and
specify base delay value.
-This prevents double fencing when different delays are configured on the
nodes.
-Use this to enable a static delay for fencing actions.
-The overall delay is derived from a random delay value adding this static
delay so that the sum is kept below the maximum delay.
-Set to eg. node1:1s;node2:5 to set different value per node.
+pcmk_delay_base (string, [0s]): Enable a base delay for fencing actions and
specify base delay value.
+This enables a static delay for fencing actions, which can help avoid
"death matches" where two nodes try to fence each other at the same time. If
pcmk_delay_max is also used, a random delay will be added such that the total
delay is kept below that value.
+This can be set to a single time value to apply to any node targeted by
this device (useful if a separate device is configured for each target), or to
a node map (for example,
commit crmsh for openSUSE:Factory
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-02-17 23:40:12
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1958 (New)
Package is "crmsh"
Thu Feb 17 23:40:12 2022 rev:240 rq:90 version:4.4.0+20220217.b8f67f4e
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-02-09
20:40:09.978514646 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1958/crmsh.changes2022-02-17
23:41:39.827700349 +0100
@@ -1,0 +2,17 @@
+Thu Feb 17 04:54:00 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220217.b8f67f4e:
+ * Dev: configure.ac: update version as 4.4.0
+ * Update ChangeLog for release 4.4.0
+
+---
+Wed Feb 09 15:43:58 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220209.0eb4fa28:
+ * Dev: remove unused files for origin unit tests way
+ * Dev: setup.py: update install requires
+ * Dev: README: update with unit tests steps
+ * Dev: crmsh-ci.yml: Add python3.6 and 3.10 into unit test list
+ * Dev: tox: Adjust tox.ini, add py36 and py310 in envlist
+
+---
Old:
crmsh-4.4.0+20220208.5e6dca1d.tar.bz2
New:
crmsh-4.4.0+20220217.b8f67f4e.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Fsby1N/_old 2022-02-17 23:41:40.415700345 +0100
+++ /var/tmp/diff_new_pack.Fsby1N/_new 2022-02-17 23:41:40.415700345 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.0+20220208.5e6dca1d
+Version:4.4.0+20220217.b8f67f4e
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Fsby1N/_old 2022-02-17 23:41:40.467700344 +0100
+++ /var/tmp/diff_new_pack.Fsby1N/_new 2022-02-17 23:41:40.467700344 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 5e6dca1d792624fce4c5b65d279d015895558135
+ b8f67f4e0eb53af9396d854a8ab740460c70c7ce
(No newline at EOF)
++ crmsh-4.4.0+20220208.5e6dca1d.tar.bz2 ->
crmsh-4.4.0+20220217.b8f67f4e.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220208.5e6dca1d/.github/workflows/crmsh-ci.yml
new/crmsh-4.4.0+20220217.b8f67f4e/.github/workflows/crmsh-ci.yml
--- old/crmsh-4.4.0+20220208.5e6dca1d/.github/workflows/crmsh-ci.yml
2022-02-08 09:44:29.0 +0100
+++ new/crmsh-4.4.0+20220217.b8f67f4e/.github/workflows/crmsh-ci.yml
2022-02-17 05:38:34.0 +0100
@@ -22,20 +22,24 @@
jobs:
unit_test:
runs-on: ubuntu-latest
+strategy:
+ matrix:
+python-version: ['3.6', '3.8', '3.10']
+ fail-fast: false
timeout-minutes: 5
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
-python-version: 3.8
+python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
- name: Test with pytest in tox
run: |
-tox -v
+tox -v -e${{ matrix.python-version }}
functional_test_crm_report_bugs:
runs-on: ubuntu-latest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220208.5e6dca1d/ChangeLog
new/crmsh-4.4.0+20220217.b8f67f4e/ChangeLog
--- old/crmsh-4.4.0+20220208.5e6dca1d/ChangeLog 2022-02-08 09:44:29.0
+0100
+++ new/crmsh-4.4.0+20220217.b8f67f4e/ChangeLog 2022-02-17 05:38:34.0
+0100
@@ -1,5 +1,19 @@
-* Thu Jan 14 2022 Xin Liang
+* Thu Feb 17 2022 Xin Liang
- Release 4.4.0
+- Dev: README: update with unit tests steps
+- Dev: crmsh-ci.yml: Add python3.6 and 3.10 into unit test list
+- Dev: tox: Adjust tox.ini, add py36 and py310 in envlist
+
+* Thu Feb 8 2022 Xin Liang
+- Release 4.4.0 rc2
+- Fix: sbd: not overwrite SYSCONFIG_SBD and sbd-disk-metadata if input
'n'(bsc#1194870)
+- Dev: bootstrap: the joining node retries an active cluster
+- Dev: behave: Change docker cgroup driver as systemd
+- Dev: ui_node: Use diff and patch instead of replace cib
+- Dev: crm report: Add dpkg support
+
+* Thu Jan 14 2022 Xin Liang
+- Release 4.4.0 rc1
- Fix: bootstrap: Don't change pacemaker.service bootup preference
(bsc#1194616)
- Fix: log: Change the log file owner as hacluster:haclient (bsc#1194619)
- Dev: crm.conf: Add OCF_1_1_SUPPORT flag to control ocf 1.1
commit crmsh for openSUSE:Factory
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-02-09 20:39:08
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1898 (New)
Package is "crmsh"
Wed Feb 9 20:39:08 2022 rev:239 rq:952630 version:4.4.0+20220208.5e6dca1d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-01-25
17:37:23.101790966 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1898/crmsh.changes2022-02-09
20:40:09.978514646 +0100
@@ -1,0 +2,16 @@
+Tue Feb 08 09:01:07 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220208.5e6dca1d:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Fix: sbd: not overwrite SYSCONFIG_SBD and sbd-disk-metadata if input
'n'(bsc#1194870)
+
+---
+Tue Feb 08 07:50:39 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220208.84dd4fdd:
+ * Dev: bootstrap: the joining node retries an active cluster
+ * Dev: behave: Change docker cgroup driver as systemd
+ * doc: Website: Add 4.3.1 release note
+ * doc: Website: Upload crmsh 4.3.x doc
+
+---
Old:
crmsh-4.4.0+20220125.d0150a88.tar.bz2
New:
crmsh-4.4.0+20220208.5e6dca1d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.oa92JX/_old 2022-02-09 20:40:10.674516311 +0100
+++ /var/tmp/diff_new_pack.oa92JX/_new 2022-02-09 20:40:10.678516321 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.0+20220125.d0150a88
+Version:4.4.0+20220208.5e6dca1d
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.oa92JX/_old 2022-02-09 20:40:10.754516502 +0100
+++ /var/tmp/diff_new_pack.oa92JX/_new 2022-02-09 20:40:10.758516512 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- dd6f18660a24fd6ab9a25d284d8abbc95b8c831f
+ 5e6dca1d792624fce4c5b65d279d015895558135
(No newline at EOF)
++ crmsh-4.4.0+20220125.d0150a88.tar.bz2 ->
crmsh-4.4.0+20220208.5e6dca1d.tar.bz2 ++
5499 lines of diff (skipped)
commit crmsh for openSUSE:Factory
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-01-25 17:36:01
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1938 (New)
Package is "crmsh"
Tue Jan 25 17:36:01 2022 rev:238 rq:948943 version:4.4.0+20220125.d0150a88
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-01-17
22:34:22.714256949 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1938/crmsh.changes2022-01-25
17:37:23.101790966 +0100
@@ -1,0 +2,12 @@
+Tue Jan 25 07:51:13 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220125.d0150a88:
+ * Dev: ui_node: Use diff and patch instead of replace cib
+
+---
+Tue Jan 18 00:56:51 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220118.5d56321b:
+ * Dev: crm report: Add dpkg support
+
+---
Old:
crmsh-4.4.0+20220117.3debc274.tar.bz2
New:
crmsh-4.4.0+20220125.d0150a88.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.BarFuu/_old 2022-01-25 17:37:23.86310 +0100
+++ /var/tmp/diff_new_pack.BarFuu/_new 2022-01-25 17:37:23.785786254 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.4.0+20220117.3debc274
+Version:4.4.0+20220125.d0150a88
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.BarFuu/_old 2022-01-25 17:37:23.873785648 +0100
+++ /var/tmp/diff_new_pack.BarFuu/_new 2022-01-25 17:37:23.881785593 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- ac97ee74e6358b03e0a50bd28a92390add801cec
+ dd6f18660a24fd6ab9a25d284d8abbc95b8c831f
(No newline at EOF)
++ crmsh-4.4.0+20220117.3debc274.tar.bz2 ->
crmsh-4.4.0+20220125.d0150a88.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220117.3debc274/crmsh/constants.py
new/crmsh-4.4.0+20220125.d0150a88/crmsh/constants.py
--- old/crmsh-4.4.0+20220117.3debc274/crmsh/constants.py2022-01-17
02:50:15.0 +0100
+++ new/crmsh-4.4.0+20220125.d0150a88/crmsh/constants.py2022-01-25
08:34:18.0 +0100
@@ -504,7 +504,6 @@
CIB_QUERY = "cibadmin -Q"
-CIB_REPLACE = "cibadmin -R -X '{xmlstr}'"
CIB_UPGRADE = "crm configure upgrade force"
CIB_RAW_FILE = "/var/lib/pacemaker/cib/cib.xml"
XML_NODE_PATH = "/cib/configuration/nodes/node"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.4.0+20220117.3debc274/crmsh/report/utillib.py
new/crmsh-4.4.0+20220125.d0150a88/crmsh/report/utillib.py
--- old/crmsh-4.4.0+20220117.3debc274/crmsh/report/utillib.py 2022-01-17
02:50:15.0 +0100
+++ new/crmsh-4.4.0+20220125.d0150a88/crmsh/report/utillib.py 2022-01-25
08:34:18.0 +0100
@@ -1154,7 +1154,21 @@
def pkg_ver_deb(packages):
-pass
+res = ""
+for pack in packages.split():
+code, out = get_command_info("dpkg-query -s %s" % pack)
+if code != 0:
+continue
+distro = "Unknown"
+for line in out.split('\n'):
+if re.match("^Package\s*:", line):
+name = line.split(':')[1].lstrip()
+elif re.match("^Version\s*:", line):
+version = line.split(':')[1].lstrip()
+elif re.match("^Architecture\s*:", line):
+arch = line.split(':')[1].lstrip()
+res += "%s %s - %s\n" % (name, version, arch)
+return res
def pkg_ver_pkg_info(packages):
@@ -1454,7 +1468,14 @@
def verify_deb(packages):
-pass
+res = ""
+for pack in packages.split():
+cmd = r"dpkg --verify %s | grep -v 'not installed'" % pack
+code, out = crmutils.get_stdout(cmd)
+if code != 0 and out:
+res = "For package %s:\n" % pack
+res += out + "\n"
+return res
def verify_packages(packages):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.4.0+20220117.3debc274/crmsh/ui_node.py
new/crmsh-4.4.0+20220125.d0150a88/crmsh/ui_node.py
--- old/crmsh-4.4.0+20220117.3debc274/crmsh/ui_node.py 2022-01-17
02:50:15.0 +0100
+++ new/crmsh-4.4.0+20220125.d0150a88/crmsh/ui_node.py 2022-01-25
08:34:18.0 +0100
@@ -337,8 +337,10 @@
res_item = xmlutil.get_set_nodes(interface_item,
"instance_attributes", create=True)
commit crmsh for openSUSE:Factory
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-01-17 22:34:01
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1892 (New)
Package is "crmsh"
Mon Jan 17 22:34:01 2022 rev:237 rq:946857 version:4.4.0+20220117.3debc274
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-01-14
23:14:34.474683387 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1892/crmsh.changes2022-01-17
22:34:22.714256949 +0100
@@ -1,0 +2,13 @@
+Mon Jan 17 03:11:42 UTC 2022 - xli...@suse.com
+
+- Update to version 4.4.0+20220117.3debc274 (tag:4.4.0-rc1):
+ * Fix: adapt report to pacemaker daemon name change
+
+---
+Fri Jan 14 10:03:53 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220114.29185644:
+ * Dev: ChangeLog: update for the recent releases
+ * Dev: update version setup.py
+
+---
Old:
crmsh-4.3.1+20220114.07d84c75.tar.bz2
New:
crmsh-4.4.0+20220117.3debc274.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ZE9ewm/_old 2022-01-17 22:34:23.182257259 +0100
+++ /var/tmp/diff_new_pack.ZE9ewm/_new 2022-01-17 22:34:23.186257262 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20220114.07d84c75
+Version:4.4.0+20220117.3debc274
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _service ++
--- /var/tmp/diff_new_pack.ZE9ewm/_old 2022-01-17 22:34:23.218257282 +0100
+++ /var/tmp/diff_new_pack.ZE9ewm/_new 2022-01-17 22:34:23.57285 +0100
@@ -3,7 +3,7 @@
https://github.com/ClusterLabs/crmsh.git
git
crmsh
-4.3.1+%cd.%h
+4.4.0+%cd.%h
master
enable
++ _servicedata ++
--- /var/tmp/diff_new_pack.ZE9ewm/_old 2022-01-17 22:34:23.238257296 +0100
+++ /var/tmp/diff_new_pack.ZE9ewm/_new 2022-01-17 22:34:23.242257299 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 07d84c751208a8b3e5781900674f3ea8e04e6dd0
+ ac97ee74e6358b03e0a50bd28a92390add801cec
(No newline at EOF)
++ crmsh-4.3.1+20220114.07d84c75.tar.bz2 ->
crmsh-4.4.0+20220117.3debc274.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20220114.07d84c75/ChangeLog
new/crmsh-4.4.0+20220117.3debc274/ChangeLog
--- old/crmsh-4.3.1+20220114.07d84c75/ChangeLog 2022-01-14 04:39:24.0
+0100
+++ new/crmsh-4.4.0+20220117.3debc274/ChangeLog 2022-01-17 02:50:15.0
+0100
@@ -1,3 +1,79 @@
+* Thu Jan 14 2022 Xin Liang
+- Release 4.4.0
+- Fix: bootstrap: Don't change pacemaker.service bootup preference
(bsc#1194616)
+- Fix: log: Change the log file owner as hacluster:haclient (bsc#1194619)
+- Dev: crm.conf: Add OCF_1_1_SUPPORT flag to control ocf 1.1 feature
+- Dev: doc: Introduce promotable clone and role Promoted/Unpromoted
+- Fix: crash_test: Adjust help output of 'crm cluster crash_test
-h'(bsc#1194615)
+- Dev: utils: Convert Master/Slave to Promoted/Unpromoted if schema support
OCF 1.1
+- Dev: xmlutil: Replace Promoted/Unpromoted as Master/Slave when OCF 1.0
schema detected
+- Dev: doc: Replace pingd as ocf:pacemaker:ping
+- Dev: ui_resource: set target-role as Promoted/Unpromoted when doing promote
or demote
+- Dev: ra: Support Promoted/Unpromoted
+- Dev: ocfs2: Fix running ocfs2 stage on cluster with diskless-sbd
+- Fix: bootstrap: Change default transport type as udpu(unicast) (bsc#1132375)
+- Dev: bootstrap: Avoid duplicated setting for rsc_defaults
+- Fix: ui_configure: Give a deprecated warning when using "ms" subcommand
(bsc#1194125)
+- Fix: xmlutil: Parse promotable clone correctly and also consider
compatibility (bsc#1194125)
+- Dev: doc: Rename hb_report as crm report
+- Dev: crm report: Get distribution info correctly and reuse it
+- Dev: crm_report: Integrate report log into crmsh logging
+- Dev: log: Print new line when input using default value in interactive mode
+- Fix: bootstrap: Change log info when need to change user login shell
(bsc#1194026)
+- Dev: crm_report: Move hb_report directory to crmsh/report
+- Dev: doc: Mention /etc/crm/profiles.yml in man crm
+- Dev: ui_node: Delete node directly using cibadmin if crm_node -R failed
+- Dev: xmlutil: Add class CrmMonXmlParser to parse xml output of crm_mon
+- Dev: ui_cluster: Exit stop process when there is no DC
+- Dev: ui_cluster: check dlm controld ra is running when stop
commit crmsh for openSUSE:Factory
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-01-14 23:13:09
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1892 (New)
Package is "crmsh"
Fri Jan 14 23:13:09 2022 rev:236 rq:946294 version:4.3.1+20220114.07d84c75
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2022-01-06
15:50:54.340958815 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1892/crmsh.changes2022-01-14
23:14:34.474683387 +0100
@@ -1,0 +2,42 @@
+Fri Jan 14 05:26:37 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220114.07d84c75:
+ * Dev: unittest: Adjust unit test for previous change
+ * Fix: bootstrap: Don't change pacemaker.service bootup preference
(bsc#1194616)
+
+---
+Fri Jan 14 03:32:50 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220114.2726e007:
+ * Fix: log: Change the log file owner as hacluster:haclient (bsc#1194619)
+ * Fix: crash_test: Adjust help output of 'crm cluster crash_test
-h'(bsc#1194615)
+
+---
+Fri Jan 14 02:49:39 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220114.2003afd7:
+ * Dev: crm.conf: Add OCF_1_1_SUPPORT flag to control ocf 1.1 feature
+ * Dev: doc: Introduce promotable clone and role Promoted/Unpromoted
+ * Dev: behave: Adjust functional test for previous changes
+ * Dev: unittest: Add unit test for previous changes
+ * Dev: utils: Convert Master/Slave to Promoted/Unpromoted if schema support
OCF 1.1
+ * Dev: xmlutil: Replace Promoted/Unpromoted as Master/Slave when OCF 1.0
schema detected
+ * Dev: doc: Replace pingd as ocf:pacemaker:ping
+ * Dev: ui_resource: set target-role as Promoted/Unpromoted when doing
promote or demote
+ * Dev: ra: Support Promoted/Unpromoted
+
+---
+Wed Jan 12 15:08:41 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220112.a945df76:
+ * Dev: unittest: Adjust unit test for previous changes
+ * Dev: ocfs2: Fix running ocfs2 stage on cluster with diskless-sbd
+
+---
+Wed Jan 12 08:42:01 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220112.6245c22e:
+ * Dev: behave: Add functional test for the new added -U option
+ * Fix: bootstrap: Change default transport type as udpu(unicast)
(bsc#1132375)
+
+---
Old:
crmsh-4.3.1+20220104.b683bf0d.tar.bz2
New:
crmsh-4.3.1+20220114.07d84c75.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.9PwDbc/_old 2022-01-14 23:14:34.994683722 +0100
+++ /var/tmp/diff_new_pack.9PwDbc/_new 2022-01-14 23:14:35.002683727 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20220104.b683bf0d
+Version:4.3.1+20220114.07d84c75
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.9PwDbc/_old 2022-01-14 23:14:35.038683750 +0100
+++ /var/tmp/diff_new_pack.9PwDbc/_new 2022-01-14 23:14:35.042683753 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 0a4a198844f550840c8d0cecf95537dca4b93046
+ 07d84c751208a8b3e5781900674f3ea8e04e6dd0
(No newline at EOF)
++ crmsh-4.3.1+20220104.b683bf0d.tar.bz2 ->
crmsh-4.3.1+20220114.07d84c75.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20220104.b683bf0d/crmsh/bootstrap.py
new/crmsh-4.3.1+20220114.07d84c75/crmsh/bootstrap.py
--- old/crmsh-4.3.1+20220104.b683bf0d/crmsh/bootstrap.py2022-01-04
10:03:01.0 +0100
+++ new/crmsh-4.3.1+20220114.07d84c75/crmsh/bootstrap.py2022-01-14
04:39:24.0 +0100
@@ -97,6 +97,7 @@
self.no_overwrite_sshkey = None
self.nic_list = None
self.unicast = None
+self.multicast = None
self.admin_ip = None
self.second_heartbeat = None
self.ipv6 = None
@@ -668,11 +669,11 @@
if pass_msg:
logger.warning("You should change the hacluster password to something
more secure!")
-start_pacemaker()
+start_pacemaker(enable_flag=True)
wait_for_cluster()
-def start_pacemaker(node_list=[]):
+def start_pacemaker(node_list=[], enable_flag=False):
"""
Start pacemaker service with wait time for sbd
When
commit crmsh for openSUSE:Factory
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-01-06 15:50:50
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1896 (New)
Package is "crmsh"
Thu Jan 6 15:50:50 2022 rev:235 rq:943881 version:4.3.1+20220104.b683bf0d
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-24
20:23:33.926031533 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1896/crmsh.changes2022-01-06
15:50:54.340958815 +0100
@@ -1,0 +2,14 @@
+Tue Jan 04 09:19:17 UTC 2022 - xli...@suse.com
+
+- Update to version 4.3.1+20220104.b683bf0d:
+ * Dev: bootstrap: Avoid duplicated setting for rsc_defaults
+
+---
+Wed Dec 29 09:18:10 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211229.ace94b1f:
+ * Dev: testcase: Adjust original testcase based on previous changes
+ * Fix: ui_configure: Give a deprecated warning when using "ms" subcommand
(bsc#1194125)
+ * Fix: xmlutil: Parse promotable clone correctly and also consider
compatibility (bsc#1194125)
+
+---
Old:
crmsh-4.3.1+20211224.922207f9.tar.bz2
New:
crmsh-4.3.1+20220104.b683bf0d.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.lTqOxa/_old 2022-01-06 15:50:54.860959101 +0100
+++ /var/tmp/diff_new_pack.lTqOxa/_new 2022-01-06 15:50:54.864959103 +0100
@@ -1,7 +1,7 @@
#
# spec file for package crmsh
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211224.922207f9
+Version:4.3.1+20220104.b683bf0d
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.lTqOxa/_old 2022-01-06 15:50:54.904959125 +0100
+++ /var/tmp/diff_new_pack.lTqOxa/_new 2022-01-06 15:50:54.908959127 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 922207f9c694bc5bc61dfaac50ba800b8447384c
+ 0a4a198844f550840c8d0cecf95537dca4b93046
(No newline at EOF)
++ crmsh-4.3.1+20211224.922207f9.tar.bz2 ->
crmsh-4.3.1+20220104.b683bf0d.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211224.922207f9/crmsh/bootstrap.py
new/crmsh-4.3.1+20220104.b683bf0d/crmsh/bootstrap.py
--- old/crmsh-4.3.1+20211224.922207f9/crmsh/bootstrap.py2021-12-24
10:24:59.0 +0100
+++ new/crmsh-4.3.1+20220104.b683bf0d/crmsh/bootstrap.py2022-01-04
10:03:01.0 +0100
@@ -1213,10 +1213,13 @@
logger.info("Loading initial cluster configuration")
+rsc_defaults_str = "rsc_defaults rsc-options: migration-threshold=3"
+if not xmlutil.RscState().has_rsc_stickiness():
+rsc_defaults_str += " resource-stickiness=1"
crm_configure_load("update", """property cib-bootstrap-options:
stonith-enabled=false
op_defaults op-options: timeout=600 record-pending=true
-rsc_defaults rsc-options: resource-stickiness=1 migration-threshold=3
-""")
+{}
+""".format(rsc_defaults_str))
_context.sbd_manager.configure_sbd_resource_and_properties()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211224.922207f9/crmsh/cibconfig.py
new/crmsh-4.3.1+20220104.b683bf0d/crmsh/cibconfig.py
--- old/crmsh-4.3.1+20211224.922207f9/crmsh/cibconfig.py2021-12-24
10:24:59.0 +0100
+++ new/crmsh-4.3.1+20220104.b683bf0d/crmsh/cibconfig.py2022-01-04
10:03:01.0 +0100
@@ -32,7 +32,7 @@
from .utils import run_ptest, is_id_valid, edit_file, get_boolean,
filter_string
from .xmlutil import is_child_rsc, rsc_constraint, sanitize_cib, rename_id,
get_interesting_nodes
from .xmlutil import is_pref_location, get_topnode, new_cib,
get_rscop_defaults_meta_node
-from .xmlutil import rename_rscref, is_ms, silly_constraint, is_container,
fix_comments
+from .xmlutil import rename_rscref, is_ms_or_promotable_clone,
silly_constraint, is_container, fix_comments
from .xmlutil import sanity_check_nvpairs, merge_nodes, op2list, mk_rsc_type,
is_resource
from .xmlutil import stuff_comments, is_comment, is_constraint, read_cib,
processing_sort_cli
from .xmlutil import find_operation, get_rsc_children_ids, is_primitive,
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-24 20:23:13
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2520 (New)
Package is "crmsh"
Fri Dec 24 20:23:13 2021 rev:234 rq:942325 version:4.3.1+20211224.922207f9
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-22
20:19:13.531879643 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2520/crmsh.changes2021-12-24
20:23:33.926031533 +0100
@@ -1,0 +2,22 @@
+Fri Dec 24 09:40:10 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211224.922207f9:
+ * Dev: doc: Rename hb_report as crm report
+ * Dev: crm report: Get distribution info correctly and reuse it
+ * Dev: behave: Change in functional test for previous crm report changes
+ * Dev: crm_report: Integrate report log into crmsh logging
+ * Dev: crm_report: Move hb_report directory to crmsh/report
+
+---
+Fri Dec 24 06:32:59 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211224.05c264ee:
+ * Dev: log: Print new line when input using default value in interactive mode
+
+---
+Fri Dec 24 00:51:04 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211224.bfa7e2d9:
+ * Fix: bootstrap: Change log info when need to change user login shell
(bsc#1194026)
+
+---
Old:
crmsh-4.3.1+20211222.9360f963.tar.bz2
New:
crmsh-4.3.1+20211224.922207f9.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.F5KoXM/_old 2021-12-24 20:23:34.502031835 +0100
+++ /var/tmp/diff_new_pack.F5KoXM/_new 2021-12-24 20:23:34.506031837 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211222.9360f963
+Version:4.3.1+20211224.922207f9
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -216,7 +216,7 @@
%{crmsh_docdir}/COPYING
%{crmsh_docdir}/AUTHORS
%{crmsh_docdir}/crm.8.html
-%{crmsh_docdir}/crmsh_hb_report.8.html
+%{crmsh_docdir}/crmsh_crm_report.8.html
%{crmsh_docdir}/profiles.html
%{crmsh_docdir}/ChangeLog
%{crmsh_docdir}/README.md
++ _servicedata ++
--- /var/tmp/diff_new_pack.F5KoXM/_old 2021-12-24 20:23:34.554031862 +0100
+++ /var/tmp/diff_new_pack.F5KoXM/_new 2021-12-24 20:23:34.558031864 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 9360f9630f93d4a023bbb4a34472ef6d573e40b7
+ 922207f9c694bc5bc61dfaac50ba800b8447384c
(No newline at EOF)
++ crmsh-4.3.1+20211222.9360f963.tar.bz2 ->
crmsh-4.3.1+20211224.922207f9.tar.bz2 ++
6650 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-22 20:18:09
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2520 (New)
Package is "crmsh"
Wed Dec 22 20:18:09 2021 rev:233 rq:942063 version:4.3.1+20211222.9360f963
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-17
23:54:51.531546904 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2520/crmsh.changes2021-12-22
20:19:13.531879643 +0100
@@ -1,0 +2,6 @@
+Wed Dec 22 06:46:57 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211222.9360f963:
+ * Dev: doc: Mention /etc/crm/profiles.yml in man crm
+
+---
Old:
crmsh-4.3.1+20211217.5d8f3f90.tar.bz2
New:
crmsh-4.3.1+20211222.9360f963.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.XY8vdT/_old 2021-12-22 20:19:14.131879924 +0100
+++ /var/tmp/diff_new_pack.XY8vdT/_new 2021-12-22 20:19:14.131879924 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211217.5d8f3f90
+Version:4.3.1+20211222.9360f963
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
@@ -217,6 +217,7 @@
%{crmsh_docdir}/AUTHORS
%{crmsh_docdir}/crm.8.html
%{crmsh_docdir}/crmsh_hb_report.8.html
+%{crmsh_docdir}/profiles.html
%{crmsh_docdir}/ChangeLog
%{crmsh_docdir}/README.md
%{crmsh_docdir}/contrib/*
++ _servicedata ++
--- /var/tmp/diff_new_pack.XY8vdT/_old 2021-12-22 20:19:14.179879947 +0100
+++ /var/tmp/diff_new_pack.XY8vdT/_new 2021-12-22 20:19:14.179879947 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 80baa8fbcbf2712d2de7b7f5cfb6f0312b29c1fd
+ 9360f9630f93d4a023bbb4a34472ef6d573e40b7
(No newline at EOF)
++ crmsh-4.3.1+20211217.5d8f3f90.tar.bz2 ->
crmsh-4.3.1+20211222.9360f963.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211217.5d8f3f90/Makefile.am
new/crmsh-4.3.1+20211222.9360f963/Makefile.am
--- old/crmsh-4.3.1+20211217.5d8f3f90/Makefile.am 2021-12-17
09:10:32.0 +0100
+++ new/crmsh-4.3.1+20211222.9360f963/Makefile.am 2021-12-22
07:30:54.0 +0100
@@ -29,7 +29,7 @@
contribdir = $(docdir)/contrib
contrib_DATA = contrib/pcmk.vim contrib/README.vimsyntax
helpdir = $(datadir)/$(PACKAGE)
-asciiman = doc/crm.8.adoc doc/crmsh_hb_report.8.adoc
+asciiman = doc/crm.8.adoc doc/crmsh_hb_report.8.adoc doc/profiles.adoc
help_DATA = doc/crm.8.adoc
generated_docs =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211217.5d8f3f90/crmsh.spec.in
new/crmsh-4.3.1+20211222.9360f963/crmsh.spec.in
--- old/crmsh-4.3.1+20211217.5d8f3f90/crmsh.spec.in 2021-12-17
09:10:32.0 +0100
+++ new/crmsh-4.3.1+20211222.9360f963/crmsh.spec.in 2021-12-22
07:30:54.0 +0100
@@ -217,6 +217,7 @@
%{crmsh_docdir}/AUTHORS
%{crmsh_docdir}/crm.8.html
%{crmsh_docdir}/crmsh_hb_report.8.html
+%{crmsh_docdir}/profiles.html
%{crmsh_docdir}/ChangeLog
%{crmsh_docdir}/README.md
%{crmsh_docdir}/contrib/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211217.5d8f3f90/doc/crm.8.adoc
new/crmsh-4.3.1+20211222.9360f963/doc/crm.8.adoc
--- old/crmsh-4.3.1+20211217.5d8f3f90/doc/crm.8.adoc2021-12-17
09:10:32.0 +0100
+++ new/crmsh-4.3.1+20211222.9360f963/doc/crm.8.adoc2021-12-22
07:30:54.0 +0100
@@ -5068,6 +5068,10 @@
Leave the program.
+FILES
+---
+include::profiles.adoc[]
+
BUGS
Even though all sensible configurations (and most of those that
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211217.5d8f3f90/doc/profiles.adoc
new/crmsh-4.3.1+20211222.9360f963/doc/profiles.adoc
--- old/crmsh-4.3.1+20211217.5d8f3f90/doc/profiles.adoc 1970-01-01
01:00:00.0 +0100
+++ new/crmsh-4.3.1+20211222.9360f963/doc/profiles.adoc 2021-12-22
07:30:54.0 +0100
@@ -0,0 +1,47 @@
+=== /etc/crm/profiles.yml
+
+ Purpose
+
+YAML file `/etc/crm/profiles.yml` contains Corosync, SBD and Pacemaker
parameters for different platforms.
+
+crmsh bootstrap detects system environment and load the corresponding
parameters predefined in this file.
+
+ Syntax
+
+
+profile_name:
+ key_name: value
+
+
+The valid profile names are:
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-17 23:54:29
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2520 (New)
Package is "crmsh"
Fri Dec 17 23:54:29 2021 rev:232 rq:941022 version:4.3.1+20211217.5d8f3f90
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-16
02:01:28.083652347 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2520/crmsh.changes2021-12-17
23:54:51.531546904 +0100
@@ -1,0 +2,8 @@
+Fri Dec 17 08:27:05 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211217.5d8f3f90:
+ * Dev: ui_node: Delete node directly using cibadmin if crm_node -R failed
+ * Dev: testcases: adjust origin testcases for OCF 1.1 update
+ * Dev: behave: Change CI image as Tumbleweed
+
+---
Old:
crmsh-4.3.1+20211215.85834218.tar.bz2
New:
crmsh-4.3.1+20211217.5d8f3f90.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.KTUB8X/_old 2021-12-17 23:54:52.135547404 +0100
+++ /var/tmp/diff_new_pack.KTUB8X/_new 2021-12-17 23:54:52.139547407 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211215.85834218
+Version:4.3.1+20211217.5d8f3f90
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.KTUB8X/_old 2021-12-17 23:54:52.215547470 +0100
+++ /var/tmp/diff_new_pack.KTUB8X/_new 2021-12-17 23:54:52.215547470 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 99c28d735cde5888794c4ef218a527c3e65ff118
+ 80baa8fbcbf2712d2de7b7f5cfb6f0312b29c1fd
(No newline at EOF)
++ crmsh-4.3.1+20211215.85834218.tar.bz2 ->
crmsh-4.3.1+20211217.5d8f3f90.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211215.85834218/crmsh/ui_node.py
new/crmsh-4.3.1+20211217.5d8f3f90/crmsh/ui_node.py
--- old/crmsh-4.3.1+20211215.85834218/crmsh/ui_node.py 2021-12-15
15:55:49.0 +0100
+++ new/crmsh-4.3.1+20211217.5d8f3f90/crmsh/ui_node.py 2021-12-17
09:10:32.0 +0100
@@ -448,8 +448,12 @@
return False
ec = utils.ext_cmd(cmd)
if ec != 0:
-logger.warning('"%s" failed, rc=%d', cmd, ec)
-return False
+node_xpath = "//nodes/node[@uname='{}']".format(node)
+cmd = 'cibadmin --delete-all --force --xpath
"{}"'.format(node_xpath)
+rc, _, err = utils.get_stdout_stderr(cmd)
+if rc != 0:
+logger.error('"%s" failed, rc=%d, %s', cmd, rc, err)
+return False
return True
@command.completers(compl.nodes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211215.85834218/test/docker_scripts.sh
new/crmsh-4.3.1+20211217.5d8f3f90/test/docker_scripts.sh
--- old/crmsh-4.3.1+20211215.85834218/test/docker_scripts.sh2021-12-15
15:55:49.0 +0100
+++ new/crmsh-4.3.1+20211217.5d8f3f90/test/docker_scripts.sh2021-12-17
09:10:32.0 +0100
@@ -1,5 +1,5 @@
#!/bin/bash
-Docker_image='liangxin1300/haleap:15.2'
+Docker_image='liangxin1300/hatbw'
HA_packages='pacemaker corosync corosync-qdevice'
TEST_TYPE='bootstrap qdevice hb_report geo'
@@ -32,6 +32,7 @@
else
docker exec -t $node_name /bin/sh -c "cd /app; ./test/run-in-travis.sh
build"
fi
+ docker exec -t $node_name /bin/sh -c "rm -rf /run/nologin"
echo "# Deploy $node_name finished"
echo
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+20211215.85834218/test/features/bootstrap_bugs.feature
new/crmsh-4.3.1+20211217.5d8f3f90/test/features/bootstrap_bugs.feature
--- old/crmsh-4.3.1+20211215.85834218/test/features/bootstrap_bugs.feature
2021-12-15 15:55:49.0 +0100
+++ new/crmsh-4.3.1+20211217.5d8f3f90/test/features/bootstrap_bugs.feature
2021-12-17 09:10:32.0 +0100
@@ -56,12 +56,12 @@
ThenCluster service is "started" on "hanode2"
WhenRun "crm corosync get nodelist.node.ring0_addr" on "hanode1"
ThenExpected "10.10.10.3" in stdout
-And Service "hawk.service" is "started" on "hanode2"
+#And Service "hawk.service" is "started" on "hanode2"
WhenRun "crm cluster remove hanode2 -y" on "hanode1"
ThenOnline nodes are "hanode1"
And Cluster service is
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-16 02:00:55
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2520 (New)
Package is "crmsh"
Thu Dec 16 02:00:55 2021 rev:231 rq:940756 version:4.3.1+20211215.85834218
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-10
21:52:55.050906693 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2520/crmsh.changes2021-12-16
02:01:28.083652347 +0100
@@ -1,0 +2,7 @@
+Wed Dec 15 15:09:05 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211215.85834218:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: xmlutil: Add class CrmMonXmlParser to parse xml output of crm_mon
+
+---
Old:
crmsh-4.3.1+20211210.a149de51.tar.bz2
New:
crmsh-4.3.1+20211215.85834218.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.aF3jY1/_old 2021-12-16 02:01:28.815652791 +0100
+++ /var/tmp/diff_new_pack.aF3jY1/_new 2021-12-16 02:01:28.831652801 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211210.a149de51
+Version:4.3.1+20211215.85834218
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.aF3jY1/_old 2021-12-16 02:01:28.903652844 +0100
+++ /var/tmp/diff_new_pack.aF3jY1/_new 2021-12-16 02:01:28.903652844 +0100
@@ -9,7 +9,7 @@
https://github.com/ClusterLabs/crmsh.git
- 9cdc6cb5447970fa20263d9edcc1234567a55303
+ 99c28d735cde5888794c4ef218a527c3e65ff118
(No newline at EOF)
++ crmsh-4.3.1+20211210.a149de51.tar.bz2 ->
crmsh-4.3.1+20211215.85834218.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211210.a149de51/crmsh/bootstrap.py
new/crmsh-4.3.1+20211215.85834218/crmsh/bootstrap.py
--- old/crmsh-4.3.1+20211210.a149de51/crmsh/bootstrap.py2021-12-10
03:35:17.0 +0100
+++ new/crmsh-4.3.1+20211215.85834218/crmsh/bootstrap.py2021-12-15
15:55:49.0 +0100
@@ -353,12 +353,7 @@
"""
with logger_utils.status_long(message):
while True:
-# -r here to display inactive resources
-# -R here to display individual clone instances
-_rc, out, err = utils.get_stdout_stderr("crm_mon -1rR")
-# Make sure clone instances also started(no Stopped instance)
-if re.search(r"{}\s+.*:\s+Started\s".format(resource), out) and \
-not
re.search(r"{}\s+.*:\s+(Stopped|Starting)".format(resource), out):
+if xmlutil.CrmMonXmlParser.is_resource_started(resource):
break
status_progress()
sleep(1)
@@ -367,8 +362,7 @@
def wait_for_cluster():
with logger_utils.status_long("Waiting for cluster"):
while True:
-_rc, out, _err = utils.get_stdout_stderr("crm_mon -1")
-if is_online(out):
+if is_online():
break
status_progress()
sleep(2)
@@ -387,12 +381,12 @@
return peer_node
-def is_online(crm_mon_txt):
+def is_online():
"""
Check whether local node is online
Besides that, in join process, check whether init node is online
"""
-if not re.search("Online: .* {} ".format(utils.this_node()), crm_mon_txt):
+if not xmlutil.CrmMonXmlParser.is_node_online(utils.this_node()):
return False
# if peer_node is None, this is in the init process
@@ -402,7 +396,7 @@
# In join process
# If the joining node is already online but can't find the init node
# The communication IP maybe mis-configured
-if not re.search("Online: .* {} ".format(peer_node), crm_mon_txt):
+if not xmlutil.CrmMonXmlParser.is_node_online(peer_node):
shutil.copy(COROSYNC_CONF_ORIG, corosync.conf())
csync2_update(corosync.conf())
utils.stop_service("corosync")
@@ -1270,7 +1264,7 @@
if utils.calculate_quorate_status(expected_votes, actual_votes) and not
diskless_sbd:
# safe to use reload
return QdevicePolicy.QDEVICE_RELOAD
-elif utils.has_resource_running():
+elif xmlutil.CrmMonXmlParser.is_any_resource_running():
# will lose quorum, and with RA running
# no reload, no restart cluster service
# just leave a warning
diff -urN '--exclude=CVS' '--exclude=.cvsignore'
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-10 21:52:32
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.2520 (New)
Package is "crmsh"
Fri Dec 10 21:52:32 2021 rev:230 rq:938974 version:4.3.1+20211210.a149de51
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-07
23:59:55.655703447 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.2520/crmsh.changes2021-12-10
21:52:55.050906693 +0100
@@ -1,0 +2,11 @@
+Fri Dec 10 02:48:29 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211210.a149de51:
+ * Dev: unittest: adjust unit test based on previous changes
+ * Dev: behave: adjust functional test based on previous changes
+ * Dev: ui_cluster: Exit stop process when there is no DC
+ * Dev: ui_cluster: check dlm controld ra is running when stop cluster
+ * Dev: log: In status_long function, add a blank line when exception
+ * Revert "Dev: ui_cluster: Make sure node is online when stop service"
+
+---
Old:
crmsh-4.3.1+20211206.e34e2fff.tar.bz2
New:
crmsh-4.3.1+20211210.a149de51.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ANrzra/_old 2021-12-10 21:52:55.650906959 +0100
+++ /var/tmp/diff_new_pack.ANrzra/_new 2021-12-10 21:52:55.654906960 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211206.e34e2fff
+Version:4.3.1+20211210.a149de51
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ANrzra/_old 2021-12-10 21:52:55.694906978 +0100
+++ /var/tmp/diff_new_pack.ANrzra/_new 2021-12-10 21:52:55.694906978 +0100
@@ -9,6 +9,6 @@
https://github.com/ClusterLabs/crmsh.git
- e34e2fff81bd37313b199fb113044ebfdbdbf373
+ 9cdc6cb5447970fa20263d9edcc1234567a55303
\ No newline at end of file
++ crmsh-4.3.1+20211206.e34e2fff.tar.bz2 ->
crmsh-4.3.1+20211210.a149de51.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211206.e34e2fff/crmsh/bootstrap.py
new/crmsh-4.3.1+20211210.a149de51/crmsh/bootstrap.py
--- old/crmsh-4.3.1+20211206.e34e2fff/crmsh/bootstrap.py2021-12-06
15:28:27.0 +0100
+++ new/crmsh-4.3.1+20211210.a149de51/crmsh/bootstrap.py2021-12-10
03:35:17.0 +0100
@@ -33,7 +33,7 @@
from . import tmpfiles
from . import lock
from . import userdir
-from .constants import SSH_OPTION, QDEVICE_HELP_INFO, CRM_MON_ONE_SHOT,
STONITH_TIMEOUT_DEFAULT
+from .constants import SSH_OPTION, QDEVICE_HELP_INFO, STONITH_TIMEOUT_DEFAULT
from . import ocfs2
from . import qdevice
from . import log
@@ -364,25 +364,14 @@
sleep(1)
-def wait_for_cluster(message="Waiting for cluster", node_list=[]):
-"""
-Wait for local node or specific node(s) online
-"""
-# Sleep here since just after pacemaker.service started, crm_mon might not
ready
-sleep(2)
-# Check if already online
-if is_online(node_list):
-return
-
-with logger_utils.status_long(message):
+def wait_for_cluster():
+with logger_utils.status_long("Waiting for cluster"):
while True:
-if is_online(node_list):
+_rc, out, _err = utils.get_stdout_stderr("crm_mon -1")
+if is_online(out):
break
status_progress()
sleep(2)
-# Sleep here since when do_stop function calling wait_for_cluster,
-# just after nodes online, if no sleep to wait, some nodes might hang with
pending
-sleep(2)
def get_cluster_node_hostname():
@@ -390,7 +379,7 @@
Get the hostname of the cluster node
"""
peer_node = None
-if _context and _context.cluster_node:
+if _context.cluster_node:
rc, out, err = utils.get_stdout_stderr("ssh {} {} crm_node
--name".format(SSH_OPTION, _context.cluster_node))
if rc != 0:
utils.fatal(err)
@@ -398,18 +387,13 @@
return peer_node
-def is_online(node_list=[]):
+def is_online(crm_mon_txt):
"""
-Check whether local node is online, or specific node(s) online
+Check whether local node is online
Besides that, in join process, check whether init node is online
"""
-_list = node_list if node_list else [utils.this_node()]
-crm_mon_txt = utils.get_stdout_or_raise_error(CRM_MON_ONE_SHOT,
remote=_list[0])
-# Make sure all nodes online
-#
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-07 23:59:52
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31177 (New)
Package is "crmsh"
Tue Dec 7 23:59:52 2021 rev:229 rq:936141 version:4.3.1+20211206.e34e2fff
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-07
00:01:18.372156141 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31177/crmsh.changes 2021-12-07
23:59:55.655703447 +0100
@@ -1,0 +2,8 @@
+Mon Dec 06 14:44:54 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211206.e34e2fff:
+ * Dev: unittest: Add unit test for previous changes
+ * Dev: behave: Add functional test for previous changes and cases
+ * Dev: sbd: Adjust timeout related values
+
+---
Old:
crmsh-4.3.1+20211206.894f84bb.tar.bz2
New:
crmsh-4.3.1+20211206.e34e2fff.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.KdZbYO/_old 2021-12-07 23:59:56.335701120 +0100
+++ /var/tmp/diff_new_pack.KdZbYO/_new 2021-12-07 23:59:56.335701120 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211206.894f84bb
+Version:4.3.1+20211206.e34e2fff
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.KdZbYO/_old 2021-12-07 23:59:56.371700997 +0100
+++ /var/tmp/diff_new_pack.KdZbYO/_new 2021-12-07 23:59:56.371700997 +0100
@@ -9,6 +9,6 @@
https://github.com/ClusterLabs/crmsh.git
- 894f84bb524938abbf7a87a5b2c427ab6a14ef42
+ e34e2fff81bd37313b199fb113044ebfdbdbf373
\ No newline at end of file
++ crmsh-4.3.1+20211206.894f84bb.tar.bz2 ->
crmsh-4.3.1+20211206.e34e2fff.tar.bz2 ++
2343 lines of diff (skipped)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-12-07 00:00:00
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31177 (New)
Package is "crmsh"
Tue Dec 7 00:00:00 2021 rev:228 rq:935925 version:4.3.1+20211206.894f84bb
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-12-02
02:11:13.259400727 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31177/crmsh.changes 2021-12-07
00:01:18.372156141 +0100
@@ -1,0 +2,28 @@
+Mon Dec 06 07:54:42 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211206.894f84bb:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: ui_cluster: check if qdevice service started when starting cluster if
qdevice configured
+ * Dev: ui_cluster: Remove node from node list if node is unreachable
+
+---
+Fri Dec 03 13:00:31 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211203.5b4e12b3:
+ * Dev: idmgmt: Avoid leading with number for ID
+ * Dev: ui_node: Improve node standby/online methods
+
+---
+Fri Dec 03 07:48:26 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211203.9b8a9910:
+ * Dev: ui_cluster: Check service is available before enable/disable qdevice
+
+---
+Fri Dec 03 07:24:09 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211203.9786bf28:
+ * Dev: unittest: Adjust unit test based on previous changes
+ * Dev: Give warning when no-quorum-policy not set as freeze while using DLM
+
+---
Old:
crmsh-4.3.1+20211129.a8e22584.tar.bz2
New:
crmsh-4.3.1+20211206.894f84bb.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.JpzJiF/_old 2021-12-07 00:01:19.104153552 +0100
+++ /var/tmp/diff_new_pack.JpzJiF/_new 2021-12-07 00:01:19.112153524 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211129.a8e22584
+Version:4.3.1+20211206.894f84bb
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.JpzJiF/_old 2021-12-07 00:01:19.180153283 +0100
+++ /var/tmp/diff_new_pack.JpzJiF/_new 2021-12-07 00:01:19.184153270 +0100
@@ -9,6 +9,6 @@
https://github.com/ClusterLabs/crmsh.git
- 47b4e4763688dee8ab0af253c8e0b73adaf95354
+ 894f84bb524938abbf7a87a5b2c427ab6a14ef42
\ No newline at end of file
++ crmsh-4.3.1+20211129.a8e22584.tar.bz2 ->
crmsh-4.3.1+20211206.894f84bb.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211129.a8e22584/crmsh/cibconfig.py
new/crmsh-4.3.1+20211206.894f84bb/crmsh/cibconfig.py
--- old/crmsh-4.3.1+20211129.a8e22584/crmsh/cibconfig.py2021-11-29
04:15:41.0 +0100
+++ new/crmsh-4.3.1+20211206.894f84bb/crmsh/cibconfig.py2021-12-06
08:41:09.0 +0100
@@ -2599,6 +2599,8 @@
if is_live_cib():
self.last_commit_time = t
self.refresh()
+
+utils.check_no_quorum_policy_with_dlm()
return rc
def _update_schema(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+20211129.a8e22584/crmsh/constants.py
new/crmsh-4.3.1+20211206.894f84bb/crmsh/constants.py
--- old/crmsh-4.3.1+20211129.a8e22584/crmsh/constants.py2021-11-29
04:15:41.0 +0100
+++ new/crmsh-4.3.1+20211206.894f84bb/crmsh/constants.py2021-12-06
08:41:09.0 +0100
@@ -508,20 +508,7 @@
CIB_RAW_FILE = "/var/lib/pacemaker/cib/cib.xml"
XML_NODE_PATH = "/cib/configuration/nodes/node"
XML_STATUS_PATH = "/cib/status/node_state"
-XML_NODE_QUERY_STANDBY_PATH =
"//nodes/node[@id='{node_id}']/instance_attributes/nvpair[@name='standby']/@value"
-XML_STATUS_QUERY_STANDBY_PATH =
"//status/node_state[@id='{node_id}']/transient_attributes/instance_attributes/nvpair[@name='standby']/@value"
-STANDBY_TEMPLATE = """
-
-
-
-"""
-STANDBY_TEMPLATE_REBOOT = """
-
-
-
-
-
-"""
-STANDBY_NV_RE = r'(
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-11-29 17:28:31
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.31177 (New)
Package is "crmsh"
Mon Nov 29 17:28:31 2021 rev:227 rq:93 version:4.3.1+20211129.a8e22584
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-11-20
02:40:36.356489956 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.31177/crmsh.changes 2021-12-02
02:11:13.259400727 +0100
@@ -1,0 +2,6 @@
+Mon Nov 29 03:29:00 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+20211129.a8e22584:
+ * Fix: crm: To avoid the potential "permission denied" error under other
users (boo#1192754)
+
+---
Old:
crmsh-4.3.1+2029.caa0b2aa.tar.bz2
New:
crmsh-4.3.1+20211129.a8e22584.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.ebgb54/_old 2021-12-02 02:11:13.791399104 +0100
+++ /var/tmp/diff_new_pack.ebgb54/_new 2021-12-02 02:11:13.795399092 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+2029.caa0b2aa
+Version:4.3.1+20211129.a8e22584
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.ebgb54/_old 2021-12-02 02:11:13.835398970 +0100
+++ /var/tmp/diff_new_pack.ebgb54/_new 2021-12-02 02:11:13.839398957 +0100
@@ -9,6 +9,6 @@
https://github.com/ClusterLabs/crmsh.git
- bcbb5398f90f86e8d9ca26afd6417ff35c389748
+ 47b4e4763688dee8ab0af253c8e0b73adaf95354
\ No newline at end of file
++ crmsh-4.3.1+2029.caa0b2aa.tar.bz2 ->
crmsh-4.3.1+20211129.a8e22584.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+2029.caa0b2aa/bin/crm
new/crmsh-4.3.1+20211129.a8e22584/bin/crm
--- old/crmsh-4.3.1+2029.caa0b2aa/bin/crm 2021-11-19 14:37:17.0
+0100
+++ new/crmsh-4.3.1+20211129.a8e22584/bin/crm 2021-11-29 04:15:41.0
+0100
@@ -27,7 +27,11 @@
try:
from crmsh import log
-log.setup_logging()
+if '-h' not in sys.argv and '--help' not in sys.argv:
+log.setup_logging()
+else:
+log.setup_logging(only_help=True)
+
from crmsh import main
except ImportError as msg:
sys.stderr.write('''Fatal error:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+2029.caa0b2aa/crmsh/log.py
new/crmsh-4.3.1+20211129.a8e22584/crmsh/log.py
--- old/crmsh-4.3.1+2029.caa0b2aa/crmsh/log.py 2021-11-19
14:37:17.0 +0100
+++ new/crmsh-4.3.1+20211129.a8e22584/crmsh/log.py 2021-11-29
04:15:41.0 +0100
@@ -398,11 +398,15 @@
os.makedirs(_dir, exist_ok=True)
-def setup_logging():
+def setup_logging(only_help=False):
"""
Setup log directory and loadding logging config dict
"""
-setup_directory_for_logfile()
+# To avoid the potential "permission denied" error under other users
(boo#1192754)
+if only_help:
+LOGGING_CFG["handlers"]["file"] = {'class': 'logging.NullHandler'}
+else:
+setup_directory_for_logfile()
logging.config.dictConfig(LOGGING_CFG)
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-11-20 02:39:23
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1895 (New)
Package is "crmsh"
Sat Nov 20 02:39:23 2021 rev:226 rq:932543 version:4.3.1+2029.caa0b2aa
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-11-17
01:15:29.998191379 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1895/crmsh.changes2021-11-20
02:40:36.356489956 +0100
@@ -1,0 +2,7 @@
+Fri Nov 19 13:51:48 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+2029.caa0b2aa:
+ * Dev: behave: Add functional test for previous changes
+ * Fix: ui_resource: Parse node and lifetime correctly (bsc#1192618)
+
+---
Old:
crmsh-4.3.1+2026.ef2bce26.tar.bz2
New:
crmsh-4.3.1+2029.caa0b2aa.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.Jrx0Rv/_old 2021-11-20 02:40:37.064487620 +0100
+++ /var/tmp/diff_new_pack.Jrx0Rv/_new 2021-11-20 02:40:37.064487620 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+2026.ef2bce26
+Version:4.3.1+2029.caa0b2aa
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.Jrx0Rv/_old 2021-11-20 02:40:37.116487449 +0100
+++ /var/tmp/diff_new_pack.Jrx0Rv/_new 2021-11-20 02:40:37.120487435 +0100
@@ -9,6 +9,6 @@
https://github.com/ClusterLabs/crmsh.git
- ef2bce265b113aef78f0146762b9bb3286780b6d
+ bcbb5398f90f86e8d9ca26afd6417ff35c389748
\ No newline at end of file
++ crmsh-4.3.1+2026.ef2bce26.tar.bz2 ->
crmsh-4.3.1+2029.caa0b2aa.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/crmsh-4.3.1+2026.ef2bce26/crmsh/ui_resource.py
new/crmsh-4.3.1+2029.caa0b2aa/crmsh/ui_resource.py
--- old/crmsh-4.3.1+2026.ef2bce26/crmsh/ui_resource.py 2021-11-16
15:44:08.0 +0100
+++ new/crmsh-4.3.1+2029.caa0b2aa/crmsh/ui_resource.py 2021-11-19
14:37:17.0 +0100
@@ -389,16 +389,24 @@
action = context.get_command_name()
action_cap = action.capitalize()
action_cmd = cmd_map_dict[action]
+usage = "usage: {} [] [] [force]".format(action)
node = None
lifetime = None
+
argl = list(args)
force = "force" in utils.fetch_opts(argl, ["force"]) or
config.core.force
-if len(argl) > 0:
+if len(argl) >= 3:
+context.fatal_error(usage)
+if len(argl) == 2: # must be
node = argl[0]
if not xmlutil.is_our_node(node):
context.fatal_error("Not our node: " + node)
-if len(argl) == 2:
-lifetime = utils.fetch_lifetime_opt(argl[1])
+lifetime = utils.fetch_lifetime_opt(argl)
+elif len(argl) == 1: # could be or
+if xmlutil.is_our_node(argl[0]):
+node = argl[0]
+else:
+lifetime = utils.fetch_lifetime_opt(argl)
if action == "move" and not node and not force:
context.fatal_error("No target node: {} requires either a target
node or 'force'".format(action_cap))
@@ -422,8 +430,7 @@
@command.alias('migrate')
@command.skill_level('administrator')
@command.wait
-@command.completers_repeating(compl.resources, compl.nodes,
- compl.choice(['reboot', 'forever', 'force']))
+@command.completers_repeating(compl.resources, compl.nodes)
def do_move(self, context, rsc, *args):
"""usage: move [] [] [force]"""
return self.move_or_ban(context, rsc, *args)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/crmsh-4.3.1+2026.ef2bce26/test/features/resource_set.feature
new/crmsh-4.3.1+2029.caa0b2aa/test/features/resource_set.feature
--- old/crmsh-4.3.1+2026.ef2bce26/test/features/resource_set.feature
2021-11-16 15:44:08.0 +0100
+++ new/crmsh-4.3.1+2029.caa0b2aa/test/features/resource_set.feature
2021-11-19 14:37:17.0 +0100
@@ -3,10 +3,12 @@
Tag @clean means need to stop cluster service if the service is available
- Background: Setup one node cluster and configure some resources
+ Background: Setup cluster and configure some resources
Given Cluster service is "stopped" on "hanode1"
commit crmsh for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package crmsh for openSUSE:Factory checked
in at 2021-11-17 01:14:20
Comparing /work/SRC/openSUSE:Factory/crmsh (Old)
and /work/SRC/openSUSE:Factory/.crmsh.new.1890 (New)
Package is "crmsh"
Wed Nov 17 01:14:20 2021 rev:225 rq:931797 version:4.3.1+2026.ef2bce26
Changes:
--- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2021-11-02
19:19:22.243093444 +0100
+++ /work/SRC/openSUSE:Factory/.crmsh.new.1890/crmsh.changes2021-11-17
01:15:29.998191379 +0100
@@ -1,0 +2,13 @@
+Tue Nov 16 14:58:36 UTC 2021 - xli...@suse.com
+
+- Update to version 4.3.1+2026.ef2bce26:
+ * Dev: unittest: Add unit test for previous changes
+ * Dev: testcase: Remove node standby/online test case
+ * Dev: behave: Rename features/steps/step_implenment.py as
features/steps/step_implementation.py
+ * Dev: behave: Add functional test for previous changes
+ * Dev: doc: Consolidate help info for those using argparse
+ * Dev: ui_cluster: Make sure node is online when stop service
+ * Dev: ui_cluster: Graceful shutdown dlm
+ * Dev: ui_cluster: Support multi sub-commands with --all option or specific
node
+
+---
Old:
crmsh-4.3.1+20211101.7cafcfec.tar.bz2
New:
crmsh-4.3.1+2026.ef2bce26.tar.bz2
Other differences:
--
++ crmsh.spec ++
--- /var/tmp/diff_new_pack.I8rzmf/_old 2021-11-17 01:15:30.854191420 +0100
+++ /var/tmp/diff_new_pack.I8rzmf/_new 2021-11-17 01:15:30.858191420 +0100
@@ -36,7 +36,7 @@
Summary:High Availability cluster command-line interface
License:GPL-2.0-or-later
Group: %{pkg_group}
-Version:4.3.1+20211101.7cafcfec
+Version:4.3.1+2026.ef2bce26
Release:0
URL:http://crmsh.github.io
Source0:%{name}-%{version}.tar.bz2
++ _servicedata ++
--- /var/tmp/diff_new_pack.I8rzmf/_old 2021-11-17 01:15:30.910191422 +0100
+++ /var/tmp/diff_new_pack.I8rzmf/_new 2021-11-17 01:15:30.910191422 +0100
@@ -9,6 +9,6 @@
https://github.com/ClusterLabs/crmsh.git
- 7cafcfec9878386333139c26e9a7ed246ef49bdd
+ ef2bce265b113aef78f0146762b9bb3286780b6d
\ No newline at end of file
++ crmsh-4.3.1+20211101.7cafcfec.tar.bz2 ->
crmsh-4.3.1+2026.ef2bce26.tar.bz2 ++
2206 lines of diff (skipped)
