import pcs-0.10.12-2.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
79c3caadce
commit
dbad5a043a
@ -0,0 +1,73 @@
|
||||
From e5fc48f45a60228a82980dcd6d68ca01cf447eac Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Mular <omular@redhat.com>
|
||||
Date: Tue, 7 Dec 2021 11:58:09 +0100
|
||||
Subject: [PATCH 2/3] fix rsc update cmd when unable to get agent metadata
|
||||
|
||||
`resource update` command failed with a traceback when updating a
|
||||
resource with a non-existing resource agent
|
||||
---
|
||||
pcs/resource.py | 14 ++++++++------
|
||||
pcs_test/tier1/legacy/test_resource.py | 21 +++++++++++++++++++++
|
||||
2 files changed, 29 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/pcs/resource.py b/pcs/resource.py
|
||||
index c0e8b0d9..4514338d 100644
|
||||
--- a/pcs/resource.py
|
||||
+++ b/pcs/resource.py
|
||||
@@ -1049,13 +1049,15 @@ def resource_update(lib, args, modifiers, deal_with_guest_change=True):
|
||||
if report_list:
|
||||
process_library_reports(report_list)
|
||||
except lib_ra.ResourceAgentError as e:
|
||||
- severity = (
|
||||
- reports.ReportItemSeverity.WARNING
|
||||
- if modifiers.get("--force")
|
||||
- else reports.ReportItemSeverity.ERROR
|
||||
- )
|
||||
process_library_reports(
|
||||
- [lib_ra.resource_agent_error_to_report_item(e, severity)]
|
||||
+ [
|
||||
+ lib_ra.resource_agent_error_to_report_item(
|
||||
+ e,
|
||||
+ reports.get_severity(
|
||||
+ reports.codes.FORCE, modifiers.get("--force")
|
||||
+ ),
|
||||
+ )
|
||||
+ ]
|
||||
)
|
||||
except LibraryError as e:
|
||||
process_library_reports(e.args)
|
||||
diff --git a/pcs_test/tier1/legacy/test_resource.py b/pcs_test/tier1/legacy/test_resource.py
|
||||
index 3f0e08b9..bae0587a 100644
|
||||
--- a/pcs_test/tier1/legacy/test_resource.py
|
||||
+++ b/pcs_test/tier1/legacy/test_resource.py
|
||||
@@ -4879,6 +4879,27 @@ class UpdateInstanceAttrs(
|
||||
),
|
||||
)
|
||||
|
||||
+ def test_nonexisting_agent(self):
|
||||
+ agent = "ocf:pacemaker:nonexistent"
|
||||
+ message = (
|
||||
+ f"Agent '{agent}' is not installed or does "
|
||||
+ "not provide valid metadata: Metadata query for "
|
||||
+ f"{agent} failed: Input/output error"
|
||||
+ )
|
||||
+ self.assert_pcs_success(
|
||||
+ f"resource create --force D0 {agent}".split(),
|
||||
+ f"Warning: {message}\n",
|
||||
+ )
|
||||
+
|
||||
+ self.assert_pcs_fail(
|
||||
+ "resource update D0 test=testA".split(),
|
||||
+ f"Error: {message}, use --force to override\n",
|
||||
+ )
|
||||
+ self.assert_pcs_success(
|
||||
+ "resource update --force D0 test=testA".split(),
|
||||
+ f"Warning: {message}\n",
|
||||
+ )
|
||||
+
|
||||
def test_update_existing(self):
|
||||
xml = """
|
||||
<resources>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
25
SOURCES/bz2028902-01-fix-enabling-corosync-qdevice.patch
Normal file
25
SOURCES/bz2028902-01-fix-enabling-corosync-qdevice.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 6b4b0c0026e5077044e4e908d093cb613ae2e94e Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Jelinek <tojeline@redhat.com>
|
||||
Date: Mon, 6 Dec 2021 16:06:31 +0100
|
||||
Subject: [PATCH 1/3] fix enabling corosync-qdevice
|
||||
|
||||
---
|
||||
pcsd/remote.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pcsd/remote.rb b/pcsd/remote.rb
|
||||
index c49db116..3574d665 100644
|
||||
--- a/pcsd/remote.rb
|
||||
+++ b/pcsd/remote.rb
|
||||
@@ -2515,7 +2515,7 @@ def qdevice_client_enable(param, request, auth_user)
|
||||
unless allowed_for_local_cluster(auth_user, Permissions::WRITE)
|
||||
return 403, 'Permission denied'
|
||||
end
|
||||
- if not ServiceChecker.new('corosync', enabled: true).is_enabled?('corosync')
|
||||
+ if not ServiceChecker.new(['corosync'], enabled: true).is_enabled?('corosync')
|
||||
return pcsd_success('corosync is not enabled, skipping')
|
||||
elsif enable_service('corosync-qdevice')
|
||||
return pcsd_success('corosync-qdevice enabled')
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 3eb6016cedc5587a55c52ead9d2899f855e9c820 Mon Sep 17 00:00:00 2001
|
||||
From df65f70b8b55de5a7d4b961ad3ffd34d35e5311e Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Devat <idevat@redhat.com>
|
||||
Date: Tue, 20 Nov 2018 15:03:56 +0100
|
||||
Subject: [PATCH] do not support cluster setup with udp(u) transport
|
||||
Subject: [PATCH 3/3] do not support cluster setup with udp(u) transport
|
||||
|
||||
---
|
||||
pcs/pcs.8.in | 2 ++
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: pcs
|
||||
Version: 0.10.12
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
|
||||
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
|
||||
# GPLv2: pcs
|
||||
@ -118,6 +118,8 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_modu
|
||||
|
||||
# pcs patches: <= 200
|
||||
# Patch1: bzNUMBER-01-name.patch
|
||||
Patch1: bz2028902-01-fix-enabling-corosync-qdevice.patch
|
||||
Patch2: bz1384485-01-fix-rsc-update-cmd-when-unable-to-get-agent-metadata.patch
|
||||
|
||||
# Downstream patches do not come from upstream. They adapt pcs for specific
|
||||
# RHEL needs.
|
||||
@ -316,6 +318,8 @@ update_times_patch(){
|
||||
%autosetup -S git -n %{pcs_source_name} -N
|
||||
%autopatch -p1 -M 200
|
||||
|
||||
update_times_patch %{PATCH1}
|
||||
update_times_patch %{PATCH2}
|
||||
update_times_patch %{PATCH101}
|
||||
|
||||
cp -f %SOURCE1 %{pcsd_public_dir}/images
|
||||
@ -565,6 +569,11 @@ remove_all_tests
|
||||
%license pyagentx_LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Wed Dec 15 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-2
|
||||
- Fixed rsc update cmd when unable to get agent metadata
|
||||
- Fixed enabling corosync-qdevice
|
||||
- Resolves: rhbz#1384485 rhbz#2028902
|
||||
|
||||
* Thu Dec 02 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-1
|
||||
- Rebased to latest upstream sources (see CHANGELOG.md)
|
||||
- Updated pcs-web-ui
|
||||
|
||||
Loading…
Reference in New Issue
Block a user