From 93b87b34cb7b9cfe84d054d2b1a34d2b684c5f5e Mon Sep 17 00:00:00 2001 From: xin liang Date: Fri, 2 Aug 2024 06:57:59 +0800 Subject: [PATCH 1/2] Revert "Dev: ui_configure: Deprecate configure erase sub-command" (bsc#1228713) This reverts commit 1d60f8030214734c8dfa3233b4fb3576da486d26. --- crmsh/ui_configure.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/crmsh/ui_configure.py b/crmsh/ui_configure.py index b4f55fd8d..a5ca5943b 100644 --- a/crmsh/ui_configure.py +++ b/crmsh/ui_configure.py @@ -885,9 +885,6 @@ def do_rename(self, context, old_id, new_id): @command.completers(compl.choice(['nodes'])) def do_erase(self, context, nodes=None): "usage: erase [nodes]" - if not options.regression_tests: - logger.warning("`crm configure erase` is deprecated. The replacement could be `crm cluster remove [node]`") - return True cib_factory.ensure_cib_updated() if nodes is None: return cib_factory.erase() From 40d8b2b00a66a847963e17bb42f1125ccef1435c Mon Sep 17 00:00:00 2001 From: xin liang Date: Fri, 2 Aug 2024 06:59:04 +0800 Subject: [PATCH 2/2] Revert "Dev: doc: Add deprecated note for 'crm configure erase'" This reverts commit cf40732c956790927c6048415e26a05fa065f19a. --- doc/crm.8.adoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/crm.8.adoc b/doc/crm.8.adoc index ba579dd99..e4696e30a 100644 --- a/doc/crm.8.adoc +++ b/doc/crm.8.adoc @@ -2875,12 +2875,6 @@ renamed. Please use the `rename` command instead. [[cmdhelp_configure_erase,erase the CIB]] ==== `erase` -.Deprecation note -**************************** -`crm configure erase` is deprecated. -The replacement could be `crm cluster remove [node]` -**************************** - The `erase` clears all configuration. Apart from nodes. To remove nodes, you have to specify an additional keyword `nodes`.