From b25777194b57e152554f90552256313b0b026567 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Tue, 9 Nov 2021 09:45:05 +0100
Subject: [PATCH] - gcp-ilb: new resource agent

  Resolves: rhbz#2021125
---
 bz2021125-gcp-ilb-fix-log_enable.patch | 29 ++++++++++++++++++++++++++
 resource-agents.spec                   | 12 ++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 bz2021125-gcp-ilb-fix-log_enable.patch

diff --git a/bz2021125-gcp-ilb-fix-log_enable.patch b/bz2021125-gcp-ilb-fix-log_enable.patch
new file mode 100644
index 0000000..b72f3e3
--- /dev/null
+++ b/bz2021125-gcp-ilb-fix-log_enable.patch
@@ -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;
diff --git a/resource-agents.spec b/resource-agents.spec
index 26bab50..7e45973 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,12 +45,13 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	2%{?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
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aws.patch
@@ -122,6 +123,9 @@ Requires: /usr/sbin/lvm
 # nfsserver / netfs.sh
 Requires: /usr/sbin/rpc.nfsd /sbin/rpc.statd /usr/sbin/rpc.mountd
 
+# ocf.py
+Requires: python3
+
 # rgmanager
 %if %{with rgmanager}
 # ip.sh
@@ -172,6 +176,7 @@ exit 1
 %setup -q -n %{upstream_prefix}-%{upstream_version}
 %patch0 -p1 -F1
 %patch1 -p1
+%patch2 -p1
 
 # bundled ha-cloud-support libs
 %patch500 -p1
@@ -501,6 +506,11 @@ 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
+- gcp-ilb: new resource agent
+
+  Resolves: rhbz#2021125
+
 * Wed Nov  3 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-1
 - Rebase to resource-agents 4.10.0 upstream release.
 - nfsserver: add nfs_server_scope parameter