!44 [sync] PR-43: fix pcs quorum device remove
From: @openeuler-sync-bot Reviewed-by: @jxy_git Signed-off-by: @jxy_git
This commit is contained in:
commit
d68b10287c
25
fix-pcs-quorum-device-remove.patch
Normal file
25
fix-pcs-quorum-device-remove.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 0b2dc6cc49715d8ae006b9f6877324e76ea9a271 Mon Sep 17 00:00:00 2001
|
||||||
|
From: rpm-build <rpm-build>
|
||||||
|
Date: Mon, 4 Sep 2023 18:20:31 +0800
|
||||||
|
Subject: [PATCH] fix pcs quorum device remove
|
||||||
|
|
||||||
|
---
|
||||||
|
pcsd/remote.rb | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/pcsd/remote.rb b/pcsd/remote.rb
|
||||||
|
index 9dabdd0..ed5f347 100644
|
||||||
|
--- a/pcsd/remote.rb
|
||||||
|
+++ b/pcsd/remote.rb
|
||||||
|
@@ -1987,7 +1987,7 @@ def qdevice_net_client_destroy(param, request, auth_user)
|
||||||
|
end
|
||||||
|
stdout, stderr, retval = run_cmd(
|
||||||
|
auth_user,
|
||||||
|
- PCS, '--' 'qdevice', 'net-client', 'destroy'
|
||||||
|
+ PCS, '--', 'qdevice', 'net-client', 'destroy'
|
||||||
|
)
|
||||||
|
if retval != 0
|
||||||
|
return [400, stderr.join('')]
|
||||||
|
--
|
||||||
|
2.39.1
|
||||||
|
|
||||||
7
pcs.spec
7
pcs.spec
@ -1,6 +1,6 @@
|
|||||||
Name: pcs
|
Name: pcs
|
||||||
Version: 0.11.2
|
Version: 0.11.2
|
||||||
Release: 4
|
Release: 5
|
||||||
License: GPLv2 and BSD-2-Clause and ASL 2.0 and MIT
|
License: GPLv2 and BSD-2-Clause and ASL 2.0 and MIT
|
||||||
URL: https://github.com/ClusterLabs/pcs
|
URL: https://github.com/ClusterLabs/pcs
|
||||||
Summary: Pacemaker Configuration System
|
Summary: Pacemaker Configuration System
|
||||||
@ -43,6 +43,8 @@ Patch3: Support-for-openEuler.patch
|
|||||||
Patch4: Adjust-regex-to-support-json-2.6.3-error.patch
|
Patch4: Adjust-regex-to-support-json-2.6.3-error.patch
|
||||||
Patch5: Fix-typing-in-resource_agent-package.patch
|
Patch5: Fix-typing-in-resource_agent-package.patch
|
||||||
Patch6: fix-pcs-config-checkpoint-diff-command.patch
|
Patch6: fix-pcs-config-checkpoint-diff-command.patch
|
||||||
|
#https://github.com/ClusterLabs/pcs/pull/522
|
||||||
|
Patch7: fix-pcs-quorum-device-remove.patch
|
||||||
|
|
||||||
# git for patches
|
# git for patches
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
@ -406,6 +408,9 @@ run_all_tests
|
|||||||
%license pyagentx_LICENSE.txt
|
%license pyagentx_LICENSE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 05 2023 zouzhimin <zouzhimin@kylinos.cn> - 0.11.2-5
|
||||||
|
- Fix pcs quorum device remove
|
||||||
|
|
||||||
* Thu Aug 31 2023 bizhiyuan <bizhiyuan@kylinos.cn> - 0.11.2-4
|
* Thu Aug 31 2023 bizhiyuan <bizhiyuan@kylinos.cn> - 0.11.2-4
|
||||||
- Fix pcs config checkpoint diff command
|
- Fix pcs config checkpoint diff command
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user