- gcp-ilb: new resource agent
Resolves: rhbz#2021125
This commit is contained in:
parent
b25777194b
commit
66d96faf40
51
bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
Normal file
51
bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
Normal file
@ -0,0 +1,51 @@
|
||||
From 14576f7ca02fb0abff188238ac019e88ab06e878 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Tue, 9 Nov 2021 11:49:36 +0100
|
||||
Subject: [PATCH] gcp-ilb: only check if log_cmd binary is available if
|
||||
log_enable is true
|
||||
|
||||
---
|
||||
heartbeat/gcp-ilb | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/gcp-ilb b/heartbeat/gcp-ilb
|
||||
index 48dc3ac4e..f84f373b7 100755
|
||||
--- a/heartbeat/gcp-ilb
|
||||
+++ b/heartbeat/gcp-ilb
|
||||
@@ -37,7 +37,7 @@ if type "socat" > /dev/null 2>&1; then
|
||||
OCF_RESKEY_cat_default="socat"
|
||||
else
|
||||
OCF_RESKEY_cat_default="nc"
|
||||
-fi;
|
||||
+fi
|
||||
|
||||
|
||||
: ${OCF_RESKEY_cat=${OCF_RESKEY_cat_default}}
|
||||
@@ -53,7 +53,7 @@ pidfile="/var/run/$OCF_RESOURCE_INSTANCE.pid"
|
||||
|
||||
|
||||
#Validate command for logging
|
||||
-if [ $OCF_RESKEY_log_enable = "true" ]; then
|
||||
+if ocf_is_true "$OCF_RESKEY_log_enable"; 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\' "
|
||||
@@ -61,7 +61,7 @@ if [ $OCF_RESKEY_log_enable = "true" ]; then
|
||||
OCF_RESKEY_log_enable="false"
|
||||
ocf_log err "\'$logging_cmd\' is invalid. External logging disabled."
|
||||
|
||||
- fi;
|
||||
+ fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -285,7 +285,8 @@ ilb_stop() {
|
||||
|
||||
ilb_validate() {
|
||||
check_binary "$OCF_RESKEY_cat"
|
||||
- check_binary "$OCF_RESKEY_log_cmd"
|
||||
+
|
||||
+ ocf_is_true "$OCF_RESKEY_log_enable" && check_binary "$OCF_RESKEY_log_cmd"
|
||||
|
||||
if ! ocf_is_decimal "$OCF_RESKEY_port"; then
|
||||
ocf_exit_reason "$OCF_RESKEY_port is not a valid port"
|
@ -45,13 +45,14 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.10.0
|
||||
Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
Patch0: nova-compute-wait-NovaEvacuate.patch
|
||||
Patch1: bz1952005-pgsqlms-new-ra.patch
|
||||
Patch2: bz2021125-gcp-ilb-fix-log_enable.patch
|
||||
Patch2: bz2021125-gcp-ilb-1-fix-log_enable.patch
|
||||
Patch3: bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
Patch500: ha-cloud-support-aws.patch
|
||||
@ -148,6 +149,7 @@ License: GPLv2+ and LGPLv2+
|
||||
Summary: Cloud resource agents
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: ha-cloud-support
|
||||
Requires: socat
|
||||
Provides: resource-agents-aliyun
|
||||
Obsoletes: resource-agents-aliyun <= %{version}
|
||||
Provides: resource-agents-gcp
|
||||
@ -177,6 +179,7 @@ exit 1
|
||||
%patch0 -p1 -F1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
# bundled ha-cloud-support libs
|
||||
%patch500 -p1
|
||||
@ -506,7 +509,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Tue Nov 9 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-2
|
||||
* Tue Nov 9 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-3
|
||||
- gcp-ilb: new resource agent
|
||||
|
||||
Resolves: rhbz#2021125
|
||||
|
Loading…
Reference in New Issue
Block a user