diff --git a/SOURCES/bz2050759-fence_aws-bundled-path.patch b/SOURCES/bz2050759-fence_aws-bundled-path.patch new file mode 100644 index 0000000..ca12af9 --- /dev/null +++ b/SOURCES/bz2050759-fence_aws-bundled-path.patch @@ -0,0 +1,11 @@ +--- fence-agents-4.2.1/agents/aws/fence_aws.py 2022-02-04 15:24:53.059127665 +0100 ++++ fence_aws 2022-02-04 15:26:16.920317885 +0100 +@@ -7,6 +7,8 @@ + from fencing import * + from fencing import fail, fail_usage, run_delay, EC_STATUS, SyslogLibHandler + ++sys.path.insert(0, '/usr/lib/fence-agents/bundled') ++ + import requests + import boto3 + from requests import HTTPError diff --git a/SPECS/fence-agents.spec b/SPECS/fence-agents.spec index 7313194..13a4f31 100644 --- a/SPECS/fence-agents.spec +++ b/SPECS/fence-agents.spec @@ -67,7 +67,7 @@ Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 4.2.1 -Release: 41%{?alphatag:.%{alphatag}}%{?dist}.5 +Release: 41%{?alphatag:.%{alphatag}}%{?dist}.6 License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: https://github.com/ClusterLabs/fence-agents @@ -140,6 +140,7 @@ Patch65: bz1862024-fence_evacuate-support-private-flavors.patch Patch66: bz1905735-fence_aws-add-imdsv2-support.patch Patch67: bz1957762-fence_azure_arm-fix-MSI-support.patch Patch68: bz2003189-fence_aws-add-filter-parameter.patch +Patch69: bz2050759-fence_aws-bundled-path.patch # bundle patches Patch1000: bz1568753-4-fence_gce-bundled-libs.patch @@ -242,6 +243,7 @@ BuildRequires: python-six >= 1.6.1 %patch66 -p1 %patch67 -p1 %patch68 -p1 +%patch69 -p1 # prevent compilation of something that won't get used anyway sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac @@ -1193,6 +1195,10 @@ The fence-agents-zvm package contains a fence agent for z/VM hypervisors %endif %changelog +* Thu Feb 10 2022 Oyvind Albrigtsen - 4.2.1-41.6 +- fence_aws: fix IMDSv2 support + Resolves: rhbz#2050759 + * Tue Oct 19 2021 Oyvind Albrigtsen - 4.2.1-41.5 - fence_aws: add "filter" parameter Resolves: rhbz#2003189