rpms/pcs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#2158790 rhbz#2159454

Browse Source 
- Rebuilt with fixed patches
This commit is contained in:
Michal Pospisil 2023-01-13 18:32:04 +01:00
parent fb2ec1b90e
commit 70516b6926
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bz2158790-01-fix-stonith-watchdog-timeout-validation.patch
View File

@ -1,4 +1,4 @@
From 5f6d6e0e9a064e210fa157f3e4a3b8c9b600c49c Mon Sep 17 00:00:00 2001 From bbf53f713189eb2233efa03bf3aa9c96eb79ba82 Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com> From: Miroslav Lisik <mlisik@redhat.com>
Date: Thu, 5 Jan 2023 16:21:44 +0100 Date: Thu, 5 Jan 2023 16:21:44 +0100
Subject: [PATCH 2/2] Fix stonith-watchdog-timeout validation Subject: [PATCH 2/2] Fix stonith-watchdog-timeout validation

20
bz2159454-01-add-agent-validation-option.patch
View File

@ -1,4 +1,4 @@
From c863d29906f175620028a438258ddc3f3ab650e7 Mon Sep 17 00:00:00 2001 From f60b24d7c70f63ceef0020a0a3b8a885aeccbdd1 Mon Sep 17 00:00:00 2001
From: Ondrej Mular <omular@redhat.com> From: Ondrej Mular <omular@redhat.com>
Date: Tue, 10 Jan 2023 15:57:33 +0100 Date: Tue, 10 Jan 2023 15:57:33 +0100
Subject: [PATCH 1/2] add '--agent-validation' option for enabling agent Subject: [PATCH 1/2] add '--agent-validation' option for enabling agent
@ -20,11 +20,11 @@ Subject: [PATCH 1/2] add '--agent-validation' option for enabling agent
.../commands/resource/test_resource_create.py | 156 ++++++++++++------ .../commands/resource/test_resource_create.py | 156 ++++++++++++------
pcs_test/tier0/lib/commands/test_booth.py | 49 ------ pcs_test/tier0/lib/commands/test_booth.py | 49 ------
pcs_test/tier0/lib/commands/test_stonith.py | 24 +-- pcs_test/tier0/lib/commands/test_stonith.py | 24 +--
pcs_test/tier1/cib_resource/test_create.py | 1 + pcs_test/tier1/cib_resource/test_create.py | 2 +
.../tier1/cib_resource/test_stonith_create.py | 2 - .../tier1/cib_resource/test_stonith_create.py | 2 -
pcs_test/tier1/legacy/test_resource.py | 8 +- pcs_test/tier1/legacy/test_resource.py | 8 +-
pcs_test/tier1/legacy/test_stonith.py | 25 ++- pcs_test/tier1/legacy/test_stonith.py | 25 ++-
19 files changed, 279 insertions(+), 146 deletions(-) 19 files changed, 280 insertions(+), 146 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378cca50..47212f00 100644 index 378cca50..47212f00 100644
@ -1373,17 +1373,19 @@ index 65a0608f..eedd1c04 100644
stonith.create_in_group( stonith.create_in_group(
diff --git a/pcs_test/tier1/cib_resource/test_create.py b/pcs_test/tier1/cib_resource/test_create.py diff --git a/pcs_test/tier1/cib_resource/test_create.py b/pcs_test/tier1/cib_resource/test_create.py
index 3a088513..b0a64b89 100644 index 3a088513..bbc1acaa 100644
--- a/pcs_test/tier1/cib_resource/test_create.py --- a/pcs_test/tier1/cib_resource/test_create.py
+++ b/pcs_test/tier1/cib_resource/test_create.py +++ b/pcs_test/tier1/cib_resource/test_create.py
@@ -751,6 +751,7 @@ class Promotable(TestCase, AssertPcsMixin): @@ -751,7 +751,9 @@ class Promotable(TestCase, AssertPcsMixin):
ensure_disabled=False, ensure_disabled=False,
use_default_operations=True, use_default_operations=True,
wait=False, wait=False,
+ enable_agent_self_validation=False, + enable_agent_self_validation=False,
): ):
+ # pylint: disable=too-many-arguments
options = locals() options = locals()
del options["self"] del options["self"]
return options
diff --git a/pcs_test/tier1/cib_resource/test_stonith_create.py b/pcs_test/tier1/cib_resource/test_stonith_create.py diff --git a/pcs_test/tier1/cib_resource/test_stonith_create.py b/pcs_test/tier1/cib_resource/test_stonith_create.py
index 77277b75..ea429b64 100644 index 77277b75..ea429b64 100644
--- a/pcs_test/tier1/cib_resource/test_stonith_create.py --- a/pcs_test/tier1/cib_resource/test_stonith_create.py
@ -1424,7 +1426,7 @@ index 3ba32ec7..d53af88b 100644
) )
diff --git a/pcs_test/tier1/legacy/test_stonith.py b/pcs_test/tier1/legacy/test_stonith.py diff --git a/pcs_test/tier1/legacy/test_stonith.py b/pcs_test/tier1/legacy/test_stonith.py
index 7e7ec030..ecdfe2e9 100644 index 7e7ec030..8ca84065 100644
--- a/pcs_test/tier1/legacy/test_stonith.py --- a/pcs_test/tier1/legacy/test_stonith.py
+++ b/pcs_test/tier1/legacy/test_stonith.py +++ b/pcs_test/tier1/legacy/test_stonith.py
@@ -1283,6 +1283,27 @@ class StonithTest(TestCase, AssertPcsMixin): @@ -1283,6 +1283,27 @@ class StonithTest(TestCase, AssertPcsMixin):
@ -1436,7 +1438,7 @@ index 7e7ec030..ecdfe2e9 100644
+ "stonith create apc-fencing fence_apc ip=morph-apc username=apc " + "stonith create apc-fencing fence_apc ip=morph-apc username=apc "
+ "--agent-validation" + "--agent-validation"
+ ).split(), + ).split(),
+ stderr_start="Error: Validation result from agent", + stdout_start="Error: Validation result from agent",
+ ) + )
+ +
+ self.assert_pcs_success( + self.assert_pcs_success(
@ -1444,12 +1446,12 @@ index 7e7ec030..ecdfe2e9 100644
+ "stonith create apc-fencing fence_apc ip=morph-apc username=apc " + "stonith create apc-fencing fence_apc ip=morph-apc username=apc "
+ "--agent-validation --force" + "--agent-validation --force"
+ ).split(), + ).split(),
+ stderr_start="Warning: Validation result from agent", + stdout_start="Warning: Validation result from agent",
+ ) + )
+ +
+ self.assert_pcs_success( + self.assert_pcs_success(
+ "stonith remove apc-fencing".split(), + "stonith remove apc-fencing".split(),
+ stderr_full="Deleting Resource - apc-fencing\n", + stdout_full="Deleting Resource - apc-fencing\n",
+ ) + )
+ +
self.assert_pcs_fail( self.assert_pcs_fail(

6
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs Name: pcs
Version: 0.11.4 Version: 0.11.4
Release: 3%{?dist} Release: 4%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPL-2.0-only: pcs # GPL-2.0-only: pcs
@ -539,6 +539,10 @@ run_all_tests
%license pyagentx_LICENSE.txt %license pyagentx_LICENSE.txt
%changelog %changelog
* Fri Jan 13 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.4-4
- Rebuilt with fixed patches
- Resolves: rhbz#2158790 rhbz#2159454
* Thu Jan 12 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.4-3 * Thu Jan 12 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.4-3
- Allow time values in stonith-watchdog-time property - Allow time values in stonith-watchdog-time property
- Resource/stonith agent self-validation of instance attributes is now disabled by default, as many agents do not work with it properly. - Resource/stonith agent self-validation of instance attributes is now disabled by default, as many agents do not work with it properly.