* Mon Aug 9 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.2.rc2
- Update for new upstream tarball for release candidate: Pacemaker-2.1.1-rc2, for full details, see included ChangeLog file or https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.1-rc2 - Added feature patch that allows to explicitly specify nodes that should do watchdog-fencing
This commit is contained in:
Klaus Wenninger
parent
6fcc0b8f5b
commit
e8f53e7d76
1119
0001-feature-watchdog-fencing-allow-restriction-to-certai.patch
Normal file
1119
0001-feature-watchdog-fencing-allow-restriction-to-certai.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,25 @@
|
||||
From 53dd360f096e5f005e3221e8d44d82d3654b5172 Mon Sep 17 00:00:00 2001
|
||||
From: Klaus Wenninger <klaus.wenninger@aon.at>
|
||||
Date: Wed, 4 Aug 2021 15:57:23 +0200
|
||||
Subject: [PATCH] Fix: watchdog-fencing: Silence warning without node
|
||||
restriction
|
||||
|
||||
---
|
||||
lib/fencing/st_client.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/lib/fencing/st_client.c b/lib/fencing/st_client.c
|
||||
index 0ff9815..14fa7b2 100644
|
||||
--- a/lib/fencing/st_client.c
|
||||
+++ b/lib/fencing/st_client.c
|
||||
@@ -223,7 +223,6 @@ stonith__watchdog_fencing_enabled_for_node_api(stonith_t *st, const char *node)
|
||||
*/
|
||||
crm_warn("watchdog-fencing-query failed");
|
||||
} else if (list[0] == '\0') {
|
||||
- crm_warn("watchdog-fencing-query returned an empty list - any node");
|
||||
rv = TRUE;
|
||||
} else {
|
||||
GList *targets = stonith__parse_targets(list);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -32,10 +32,10 @@
|
||||
## can be incremented to build packages reliably considered "newer"
|
||||
## than previously built packages with the same pcmkversion)
|
||||
%global pcmkversion 2.1.1
|
||||
%global specversion 0.1.rc1
|
||||
%global specversion 0.2.rc2
|
||||
|
||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||
%global commit 9e3a841a33c3125034922ec061f6516d307f20d1
|
||||
%global commit a64ad221abe9cdd968ceacd35c23832ce0fcd189
|
||||
|
||||
## Since git v2.11, the extent of abbreviation is autoscaled by default
|
||||
## (used to be constant of 7), so we need to convey it for non-tags, too.
|
||||
@ -215,6 +215,8 @@ Url: https://www.clusterlabs.org/
|
||||
# You can use "spectool -s 0 pacemaker.spec" (rpmdevtools) to show final URL.
|
||||
Source0: https://codeload.github.com/%{github_owner}/%{name}/tar.gz/%{archive_github_url}
|
||||
Source1: https://codeload.github.com/%{github_owner}/%{nagios_name}/tar.gz/%{nagios_archive_github_url}
|
||||
Patch0: 0001-feature-watchdog-fencing-allow-restriction-to-certai.patch
|
||||
Patch1: 0002-Fix-watchdog-fencing-Silence-warning-without-node-re.patch
|
||||
|
||||
# upstream commits
|
||||
|
||||
@ -240,9 +242,19 @@ Requires: libqb >= 0.17.0
|
||||
BuildRequires: libqb-devel >= 0.17.0
|
||||
|
||||
# Required basic build tools
|
||||
BuildRequires: coreutils findutils grep sed
|
||||
BuildRequires: autoconf automake gcc make pkgconfig
|
||||
BuildRequires: libtool %{?pkgname_libtool_devel}
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: findutils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: grep
|
||||
BuildRequires: libtool
|
||||
BuildRequires: make
|
||||
%if %{defined pkgname_libtool_devel}
|
||||
BuildRequires: %{?pkgname_libtool_devel}
|
||||
%endif
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sed
|
||||
|
||||
# Required for core functionality
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.42
|
||||
@ -250,8 +262,12 @@ BuildRequires: libxml2-devel libxslt-devel libuuid-devel
|
||||
BuildRequires: %{pkgname_bzip2_devel}
|
||||
|
||||
# Enables optional functionality
|
||||
BuildRequires: ncurses-devel %{pkgname_docbook_xsl}
|
||||
BuildRequires: help2man %{pkgname_gnutls_devel} pam-devel pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: %{pkgname_docbook_xsl}
|
||||
BuildRequires: %{pkgname_gnutls_devel}
|
||||
BuildRequires: help2man
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: pam-devel
|
||||
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
|
||||
@ -266,7 +282,9 @@ BuildRequires: %{pkgname_glue_libs}-devel
|
||||
%endif
|
||||
|
||||
%if %{with doc}
|
||||
BuildRequires: asciidoc inkscape %{python_name}-sphinx
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: inkscape
|
||||
BuildRequires: %{python_name}-sphinx
|
||||
%endif
|
||||
|
||||
Provides: pcmk-cluster-manager = %{version}-%{release}
|
||||
@ -368,11 +386,16 @@ License: GPLv2+ and LGPLv2+
|
||||
Summary: Pacemaker development package
|
||||
Requires: %{pkgname_pcmk_libs}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-cluster-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: %{?pkgname_libtool_devel_arch} libuuid-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa} libxslt-devel%{?_isa}
|
||||
Requires: %{pkgname_bzip2_devel}%{?_isa} glib2-devel%{?_isa}
|
||||
Requires: %{pkgname_bzip2_devel}%{?_isa}
|
||||
Requires: corosync-devel >= 2.0.0
|
||||
Requires: glib2-devel%{?_isa}
|
||||
Requires: libqb-devel%{?_isa}
|
||||
Requires: corosync-devel%{?_isa} >= 2.0.0
|
||||
%if %{defined pkgname_libtool_devel_arch}
|
||||
Requires: %{?pkgname_libtool_devel_arch}
|
||||
%endif
|
||||
Requires: libuuid-devel%{?_isa}
|
||||
Requires: libxml2-devel%{?_isa}
|
||||
Requires: libxslt-devel%{?_isa}
|
||||
|
||||
%description -n %{pkgname_pcmk_libs}-devel
|
||||
Pacemaker is an advanced, scalable High-Availability cluster resource
|
||||
@ -645,6 +668,7 @@ exit 0
|
||||
%doc %{_mandir}/man7/ocf_pacemaker_remote.*
|
||||
%doc %{_mandir}/man8/crm_attribute.*
|
||||
%doc %{_mandir}/man8/crm_master.*
|
||||
%doc %{_mandir}/man8/fence_watchdog.*
|
||||
%doc %{_mandir}/man8/pacemakerd.*
|
||||
|
||||
%doc %{_datadir}/pacemaker/alerts
|
||||
@ -685,6 +709,7 @@ exit 0
|
||||
%{_sbindir}/crm_simulate
|
||||
%{_sbindir}/crm_report
|
||||
%{_sbindir}/crm_ticket
|
||||
%{_sbindir}/fence_watchdog
|
||||
%{_sbindir}/stonith_admin
|
||||
# "dirname" is owned by -schemas, which is a prerequisite
|
||||
%{_datadir}/pacemaker/report.collector
|
||||
@ -711,6 +736,7 @@ exit 0
|
||||
%exclude %{_mandir}/man8/crm_attribute.*
|
||||
%exclude %{_mandir}/man8/crm_master.*
|
||||
%exclude %{_mandir}/man8/fence_legacy.*
|
||||
%exclude %{_mandir}/man8/fence_watchdog.*
|
||||
%exclude %{_mandir}/man8/pacemakerd.*
|
||||
%exclude %{_mandir}/man8/pacemaker-remoted.*
|
||||
|
||||
@ -799,6 +825,13 @@ exit 0
|
||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Mon Aug 9 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.2.rc2
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-2.1.1-rc2,
|
||||
for full details, see included ChangeLog file or
|
||||
https://github.com/ClusterLabs/pacemaker/releases/tag/Pacemaker-2.1.1-rc2
|
||||
- Added feature patch that allows to explicitly specify nodes that
|
||||
should do watchdog-fencing
|
||||
|
||||
* Wed Jul 28 2021 Klaus Wenninger <kwenning@redhat.com> - 2.1.1-0.1.rc1
|
||||
- Update for new upstream tarball for release candidate: Pacemaker-2.1.1-rc1,
|
||||
for full details, see included ChangeLog file or
|
||||
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (nagios-agents-metadata-105ab8a7b2c16b9a29cf1c1596b80136eeef332b.tar.gz) = 11ddeb48a4929e7642b6dfa9c7962aa1d7a1af1c569830f55ed6cd6773abac13377317327bc1db8411c8077884f83f81cc54d746c834b63a99fa6dc219b5caad
|
||||
SHA512 (pacemaker-9e3a841a3.tar.gz) = 26745ba0d9f6730de13ad106fe57beaff9d49c7df1ec528f0689c2faa872608408fb04401a4d49d73deec5422bd7665496a964b1fcbe69866a5983ac2306b6be
|
||||
SHA512 (pacemaker-a64ad221a.tar.gz) = ee954bd8efd135965290f9958b65680cbf101e14e2fd22d326e53a250281a7e5b6b6ec979c7f76072514dbf4d29868e99931842dbcc99bab5e5ba5e4bbc4ef0a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user