From b416b8415459596da3171820cc2f7724f914f150 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 2 Dec 2021 16:44:00 +0000 Subject: [PATCH] import resource-agents-4.9.0-11.el8 --- ...91-nfsnotify-fix-notify_args-default.patch | 22 +++++++++++++++++++ SPECS/resource-agents.spec | 9 +++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 SOURCES/bz2027591-nfsnotify-fix-notify_args-default.patch diff --git a/SOURCES/bz2027591-nfsnotify-fix-notify_args-default.patch b/SOURCES/bz2027591-nfsnotify-fix-notify_args-default.patch new file mode 100644 index 0000000..75ca836 --- /dev/null +++ b/SOURCES/bz2027591-nfsnotify-fix-notify_args-default.patch @@ -0,0 +1,22 @@ +From 1c037b3ac0288509fb2b74fb4a661a504155da15 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 26 Aug 2021 12:27:50 +0200 +Subject: [PATCH] nfsnotify: fix default value for "notify_args" + +--- + heartbeat/nfsnotify.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/nfsnotify.in b/heartbeat/nfsnotify.in +index 851f6ad6b4..fe6d2793ba 100644 +--- a/heartbeat/nfsnotify.in ++++ b/heartbeat/nfsnotify.in +@@ -33,7 +33,7 @@ + # Parameter defaults + + OCF_RESKEY_source_host_default="" +-OCF_RESKEY_notify_args_default="false" ++OCF_RESKEY_notify_args_default="" + + : ${OCF_RESKEY_source_host=${OCF_RESKEY_source_host_default}} + : ${OCF_RESKEY_notify_args=${OCF_RESKEY_notify_args_default}} diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 24e8dcf..180ae0a 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -66,7 +66,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.9.0 -Release: 10%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 11%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -92,6 +92,7 @@ Patch5: bz2014415-nfsserver-add-nfs_server_scope-parameter.patch Patch6: bz2015789-gcp-ilb-1-fix-log_enable.patch Patch7: bz2015789-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch Patch8: bz2015789-gcp-ilb-3-use-bundled-gcloud.patch +Patch9: bz2027591-nfsnotify-fix-notify_args-default.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -274,6 +275,7 @@ exit 1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -854,6 +856,11 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Nov 30 2021 Oyvind Albrigtsen - 4.9.0-11 +- nfsnotify: fix default value for "notify_args" + + Resolves: rhbz#2027591 + * Tue Nov 9 2021 Oyvind Albrigtsen - 4.9.0-10 - gcp-ilb: new resource agent