import resource-agents-4.9.0-10.el8

SOURCES/bz2015789-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch

@@ -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"

SOURCES/bz2015789-gcp-ilb-3-use-bundled-gcloud.patch

@@ -0,0 +1,11 @@
+--- a/heartbeat/gcp-ilb	2021-11-09 14:13:20.311243373 +0100
++++ b/heartbeat/gcp-ilb	2021-11-09 14:13:50.269329165 +0100
+@@ -28,7 +28,7 @@
+ OCF_RESKEY_cat_default="socat"
+ OCF_RESKEY_port_default="60000"
+ OCF_RESKEY_log_enable_default="false"
+-OCF_RESKEY_log_cmd_default="gcloud"
++OCF_RESKEY_log_cmd_default="gcloud-ra"
+ OCF_RESKEY_log_params_default="logging write GCPILB"
+ OCF_RESKEY_log_end_params_default=""
+ 

SPECS/resource-agents.spec

@@ -66,7 +66,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	8%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	10%{?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}
@@ -89,7 +89,9 @@ Patch2:		bz1995178-storage-mon-fix-typo.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
 Patch5:		bz2014415-nfsserver-add-nfs_server_scope-parameter.patch
-Patch6:		bz2015789-gcp-ilb-fix-log_enable.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
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -270,6 +272,8 @@ exit 1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -850,7 +854,7 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
-* Mon Nov  8 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-8
+* Tue Nov  9 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-10
 - gcp-ilb: new resource agent
 
   Resolves: rhbz#2015789