diff --git a/RHEL-114489-2-powervs-move-ip-set-bundled-path.patch b/RHEL-114489-2-powervs-move-ip-set-bundled-path.patch index 167bdf2..20c2d65 100644 --- a/RHEL-114489-2-powervs-move-ip-set-bundled-path.patch +++ b/RHEL-114489-2-powervs-move-ip-set-bundled-path.patch @@ -8,7 +8,7 @@ -import requests.adapters -import urllib3.util +try: -+ sys.path.insert(0, '/usr/lib/fence-agents/support/ibm') ++ sys.path.insert(0, '/usr/lib/fence-agents/support/ibm/lib/python#PYTHON3_VERSION#/site-packages') + import requests + import requests.adapters + import urllib3.util diff --git a/ha-cloud-support-gcloud.patch b/ha-cloud-support-gcloud.patch index 95b0d7a..f998bfc 100644 --- a/ha-cloud-support-gcloud.patch +++ b/ha-cloud-support-gcloud.patch @@ -5,7 +5,7 @@ diff --color -uNr a/heartbeat/gcp-pd-move.in b/heartbeat/gcp-pd-move.in from ocf import logger try: -+ sys.path.insert(0, '/usr/lib/fence-agents/support/google') ++ sys.path.insert(0, '/usr/lib/fence-agents/support/google/lib/python#PYTHON3_VERSION#/site-packages') import googleapiclient.discovery except ImportError: pass @@ -16,7 +16,7 @@ diff --color -uNr a/heartbeat/gcp-vpc-move-route.in b/heartbeat/gcp-vpc-move-rou from ocf import * try: -+ sys.path.insert(0, '/usr/lib/fence-agents/support/google') ++ sys.path.insert(0, '/usr/lib/fence-agents/support/google/lib/python#PYTHON3_VERSION#/site-packages') import googleapiclient.discovery import pyroute2 try: @@ -27,7 +27,7 @@ diff --color -uNr a/heartbeat/gcp-vpc-move-vip.in b/heartbeat/gcp-vpc-move-vip.i from ocf import * try: -+ sys.path.insert(0, '/usr/lib/fence-agents/support/google') ++ sys.path.insert(0, '/usr/lib/fence-agents/support/google/lib/python#PYTHON3_VERSION#/site-packages') import googleapiclient.discovery try: from google.oauth2.service_account import Credentials as ServiceAccountCredentials diff --git a/ha-cloud-support-ibm.patch b/ha-cloud-support-ibm.patch index 7b5ee4a..475dc62 100644 --- a/ha-cloud-support-ibm.patch +++ b/ha-cloud-support-ibm.patch @@ -8,7 +8,7 @@ -import requests.adapters -import urllib3.util +try: -+ sys.path.insert(0, '/usr/lib/fence-agents/support/ibm') ++ sys.path.insert(0, '/usr/lib/fence-agents/support/ibm/lib/python#PYTHON3_VERSION#/site-packages') + import requests + import requests.adapters + import urllib3.util diff --git a/resource-agents.spec b/resource-agents.spec index 626cdd5..b9f6335 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 112%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 113%{?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 @@ -322,7 +322,7 @@ service managers. License: GPLv2+ and LGPLv2+ Summary: Cloud resource agents Requires: %{name} = %{version}-%{release} -Requires: ha-cloud-support >= 4.10.0-63 +Requires: ha-cloud-support >= 4.10.0-111 Requires: socat Provides: resource-agents-aliyun Obsoletes: resource-agents-aliyun <= %{version} @@ -518,6 +518,8 @@ chmod 755 heartbeat/NovaEvacuate chmod 755 heartbeat/pgsqlms %build +sed -i -e "s/#PYTHON3_VERSION#/%{python3_version}/" heartbeat/*.in + if [ ! -f configure ]; then ./autogen.sh fi @@ -547,10 +549,10 @@ export CFLAGS PYTHON="%{__python3}" \ %endif %ifarch x86_64 - PYTHONPATH="%{_usr}/lib/fence-agents/support/google" \ + PYTHONPATH="%{_usr}/lib/fence-agents/support/google/lib/python%{python3_version}/site-packages" \ %endif %ifarch ppc64le - PYTHONPATH="%{_usr}/lib/fence-agents/support/ibm" \ + PYTHONPATH="%{_usr}/lib/fence-agents/support/ibm/lib/python%{python3_version}/site-packages" \ %endif %{conf_opt_fatal} \ %if %{defined _unitdir} @@ -839,6 +841,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Mon Apr 20 2026 Oyvind Albrigtsen - 4.10.0-113 +- Cloud agents: change bundled lib paths to match changes in + ha-cloud-support + + Resolves: RHEL-168563 + * Fri Apr 10 2026 Oyvind Albrigtsen - 4.10.0-112 - db2: do not use db2stop to avoid divergence in the log