import resource-agents-4.9.0-8.el8
This commit is contained in:
parent
457dc205fa
commit
d8937126bb
29
SOURCES/bz2015789-gcp-ilb-fix-log_enable.patch
Normal file
29
SOURCES/bz2015789-gcp-ilb-fix-log_enable.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 9a7b47f1838e9d6e3c807e9db5312097adb5c499 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Fri, 5 Nov 2021 10:30:49 +0100
|
||||||
|
Subject: [PATCH] gcp-ilb/Squid: fix issues detected by CI
|
||||||
|
|
||||||
|
---
|
||||||
|
heartbeat/Squid.in | 2 +-
|
||||||
|
heartbeat/gcp-ilb | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/heartbeat/gcp-ilb b/heartbeat/gcp-ilb
|
||||||
|
index 28484b241..48dc3ac4e 100755
|
||||||
|
--- a/heartbeat/gcp-ilb
|
||||||
|
+++ b/heartbeat/gcp-ilb
|
||||||
|
@@ -53,12 +53,12 @@ pidfile="/var/run/$OCF_RESOURCE_INSTANCE.pid"
|
||||||
|
|
||||||
|
|
||||||
|
#Validate command for logging
|
||||||
|
-if $OCF_RESKEY_log_enable = "true"; then
|
||||||
|
+if [ $OCF_RESKEY_log_enable = "true" ]; then
|
||||||
|
if type $OCF_RESKEY_log_cmd > /dev/null 2>&1; then
|
||||||
|
logging_cmd="$OCF_RESKEY_log_cmd $OCF_RESKEY_log_params"
|
||||||
|
ocf_log debug "Logging command is: \'$logging_cmd\' "
|
||||||
|
else
|
||||||
|
- $OCF_RESKEY_log_enable = "false"
|
||||||
|
+ OCF_RESKEY_log_enable="false"
|
||||||
|
ocf_log err "\'$logging_cmd\' is invalid. External logging disabled."
|
||||||
|
|
||||||
|
fi;
|
@ -66,7 +66,7 @@
|
|||||||
Name: resource-agents
|
Name: resource-agents
|
||||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||||
Version: 4.9.0
|
Version: 4.9.0
|
||||||
Release: 7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
Release: 8%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: https://github.com/ClusterLabs/resource-agents
|
URL: https://github.com/ClusterLabs/resource-agents
|
||||||
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
|
||||||
@ -89,6 +89,7 @@ Patch2: bz1995178-storage-mon-fix-typo.patch
|
|||||||
Patch3: bz2008333-gcp-pd-move-gcp-vpc-move-route-dont-fail-due-to-incorrect-rc.patch
|
Patch3: bz2008333-gcp-pd-move-gcp-vpc-move-route-dont-fail-due-to-incorrect-rc.patch
|
||||||
Patch4: bz2003117-all-agents-set-correct-agent-ocf-version.patch
|
Patch4: bz2003117-all-agents-set-correct-agent-ocf-version.patch
|
||||||
Patch5: bz2014415-nfsserver-add-nfs_server_scope-parameter.patch
|
Patch5: bz2014415-nfsserver-add-nfs_server_scope-parameter.patch
|
||||||
|
Patch6: bz2015789-gcp-ilb-fix-log_enable.patch
|
||||||
|
|
||||||
# bundle patches
|
# bundle patches
|
||||||
Patch1000: 7-gcp-bundled.patch
|
Patch1000: 7-gcp-bundled.patch
|
||||||
@ -268,6 +269,7 @@ exit 1
|
|||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
|
||||||
chmod 755 heartbeat/nova-compute-wait
|
chmod 755 heartbeat/nova-compute-wait
|
||||||
chmod 755 heartbeat/NovaEvacuate
|
chmod 755 heartbeat/NovaEvacuate
|
||||||
@ -848,7 +850,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
|
|||||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Oct 28 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-7
|
* Mon Nov 8 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-8
|
||||||
- gcp-ilb: new resource agent
|
- gcp-ilb: new resource agent
|
||||||
|
|
||||||
Resolves: rhbz#2015789
|
Resolves: rhbz#2015789
|
||||||
|
Loading…
Reference in New Issue
Block a user