From 98e60804df98cf15fa6f2cd475504015c1042bd5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 07 2022 10:10:38 +0000
Subject: import fence-agents-4.2.1-94.el8


---

diff --git a/SOURCES/bz2080994-fence_ibm_vpc-fix-parameters.patch b/SOURCES/bz2080994-fence_ibm_vpc-fix-parameters.patch
new file mode 100644
index 0000000..5e031ad
--- /dev/null
+++ b/SOURCES/bz2080994-fence_ibm_vpc-fix-parameters.patch
@@ -0,0 +1,65 @@
+From d0254345472c9415af1e06e9e8df2fe0ce464db0 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 2 May 2022 11:14:42 +0200
+Subject: [PATCH] fence_ibm_vpc: remove unused instance parameter and make
+ limit optional
+
+---
+ agents/ibm_vpc/fence_ibm_vpc.py       | 11 +----------
+ tests/data/metadata/fence_ibm_vpc.xml |  7 +------
+ 2 files changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/agents/ibm_vpc/fence_ibm_vpc.py b/agents/ibm_vpc/fence_ibm_vpc.py
+index 9f84f7b2d..9e38e8301 100755
+--- a/agents/ibm_vpc/fence_ibm_vpc.py
++++ b/agents/ibm_vpc/fence_ibm_vpc.py
+@@ -161,14 +161,6 @@ def define_new_opts():
+ 		"shortdesc" : "API Key",
+ 		"order" : 0
+ 	}
+-	all_opt["instance"] = {
+-		"getopt" : ":",
+-		"longopt" : "instance",
+-		"help" : "--instance=[instance]          Cloud Instance",
+-		"required" : "1",
+-		"shortdesc" : "Cloud Instance",
+-		"order" : 0
+-	}
+ 	all_opt["region"] = {
+ 		"getopt" : ":",
+ 		"longopt" : "region",
+@@ -181,7 +173,7 @@ def define_new_opts():
+ 		"getopt" : ":",
+ 		"longopt" : "limit",
+ 		"help" : "--limit=[number]               Limit number of nodes returned by API",
+-		"required" : "1",
++		"required" : "0",
+ 		"default": 50,
+ 		"shortdesc" : "Number of nodes returned by API",
+ 		"order" : 0
+@@ -191,7 +183,6 @@ def define_new_opts():
+ def main():
+ 	device_opt = [
+ 		"apikey",
+-		"instance",
+ 		"region",
+ 		"limit",
+ 		"port",
+diff --git a/tests/data/metadata/fence_ibm_vpc.xml b/tests/data/metadata/fence_ibm_vpc.xml
+index 926efcaa0..ee7151673 100644
+--- a/tests/data/metadata/fence_ibm_vpc.xml
++++ b/tests/data/metadata/fence_ibm_vpc.xml
+@@ -8,12 +8,7 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">API Key</shortdesc>
+ 	</parameter>
+-	<parameter name="instance" unique="0" required="1">
+-		<getopt mixed="--instance=[instance]" />
+-		<content type="string"  />
+-		<shortdesc lang="en">Cloud Instance</shortdesc>
+-	</parameter>
+-	<parameter name="limit" unique="0" required="1">
++	<parameter name="limit" unique="0" required="0">
+ 		<getopt mixed="--limit=[number]" />
+ 		<content type="string" default="50"  />
+ 		<shortdesc lang="en">Number of nodes returned by API</shortdesc>
diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec
index 517dada..0bf8b45 100644
--- a/SPECS/fence-agents.spec
+++ b/SPECS/fence-agents.spec
@@ -87,7 +87,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.2.1
-Release: 93%{?alphatag:.%{alphatag}}%{?dist}
+Release: 94%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: https://github.com/ClusterLabs/fence-agents
@@ -285,6 +285,7 @@ Patch110: bz1886074-2-fence_openstack.patch
 Patch111: bz1886074-3-fence_openstack-bundled.patch
 Patch112: bz2072421-all-agents-unify-ssl-parameters.patch
 Patch113: bz2078244-fence_gce-update.patch
+Patch114: bz2080994-fence_ibm_vpc-fix-parameters.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hds_cb hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
@@ -476,6 +477,7 @@ BuildRequires: python3-google-api-client python3-pip python3-wheel python3-jinja
 %patch111 -p1 -F1
 %patch112 -p1
 %patch113 -p1
+%patch114 -p1
 
 # prevent compilation of something that won't get used anyway
 sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@@ -1500,6 +1502,11 @@ Fence agent for IBM z/VM over IP.
 %endif
 
 %changelog
+* Thu May  5 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-94
+- fence_ibm_vpc: remove unused instance parameter and make limit
+  optional
+  Resolves: rhbz#2080994
+
 * Thu Apr 28 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-93
 - all agents: unify ssl parameters to avoid having to use --ssl when
   using --ssl-secure/--ssl-insecure for some agents