rpms/resource-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- powervs-move-ip: new resource agent

Browse Source 
Resolves: RHEL-114489
This commit is contained in:
Oyvind Albrigtsen 2025-09-15 15:11:34 +02:00
parent 63dac932e1
commit 775e787b32
5 changed files with 1243 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1127
RHEL-114489-1-powervs-move-ip-new-ra.patch Normal file
View File

File diff suppressed because it is too large Load Diff

19
RHEL-114489-2-powervs-move-ip-set-bundled-path.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/heartbeat/powervs-move-ip.in 2025-09-15 16:13:34.225046827 +0200
+++ b/heartbeat/powervs-move-ip.in 2025-09-15 17:39:02.746258434 +0200
@@ -33,9 +33,13 @@
from pathlib import Path
from urllib.parse import urlparse
-import requests
-import requests.adapters
-import urllib3.util
+try:
+ sys.path.insert(0, '/usr/lib/fence-agents/support/ibm')
+ import requests
+ import requests.adapters
+ import urllib3.util
+except ImportError:
+ pass
# Constants
OCF_FUNCTIONS_DIR = os.environ.get(

0
RHEL-42513-powervs-subnet-new-ra.patch → RHEL-42513-1-powervs-subnet-new-ra.patch
View File

84
RHEL-42513-2-build-dont-build-powervs-subnet-if-dependencies-are-missing.patch Normal file
View File

@ -0,0 +1,84 @@
From 277370f569b34e1cfb49637f9a00afc20bcd4c54 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 17 Jul 2024 10:43:29 +0200
Subject: [PATCH] build: dont build powervs-subnet if dependencies are missing
---
configure.ac | 9 +++++++++
doc/man/Makefile.am | 5 ++++-
heartbeat/Makefile.am | 5 ++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index b785e2c2c..21ce27423 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,6 +519,8 @@ fi
AC_PYTHON_MODULE(json)
AC_PYTHON_MODULE(pyroute2)
+AC_PYTHON_MODULE(requests)
+AC_PYTHON_MODULE(urllib3)
AS_VERSION_COMPARE([$PYTHON_VERSION], [3.6], [BUILD_OCF_PY=0], [BUILD_OCF_PY=1], [BUILD_OCF_PY=1])
@@ -557,6 +559,13 @@ if test -z "$PYTHON" || test $BUILD_OCF_PY -eq 0; then
fi
AM_CONDITIONAL(BUILD_GCP_VPC_MOVE_VIP, test $BUILD_GCP_VPC_MOVE_VIP -eq 1)
+BUILD_POWERVS_SUBNET=1
+if test -z "$PYTHON" || test $BUILD_OCF_PY -eq 0 || test "x${HAVE_PYMOD_REQUESTS}" != xyes || test "x${HAVE_PYMOD_URLLIB3}" != xyes; then
+ BUILD_POWERVS_SUBNET=0
+ AC_MSG_WARN("Not building powervs-subnet")
+fi
+AM_CONDITIONAL(BUILD_POWERVS_SUBNET, test $BUILD_POWERVS_SUBNET -eq 1)
+
AC_PATH_PROGS(ROUTE, route)
AC_DEFINE_UNQUOTED(ROUTE, "$ROUTE", path to route command)
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index e577e6357..ef7639bff 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -190,7 +190,6 @@ man_MANS = ocf_heartbeat_AoEtarget.7 \
ocf_heartbeat_portblock.7 \
ocf_heartbeat_postfix.7 \
ocf_heartbeat_pound.7 \
- ocf_heartbeat_powervs-subnet.7 \
ocf_heartbeat_proftpd.7 \
ocf_heartbeat_rabbitmq-cluster.7 \
ocf_heartbeat_rabbitmq-server-ha.7 \
@@ -238,6 +237,10 @@ if BUILD_GCP_VPC_MOVE_VIP
man_MANS += ocf_heartbeat_gcp-vpc-move-vip.7
endif
+if BUILD_POWERVS_SUBNET
+man_MANS += ocf_heartbeat_powervs-subnet.7
+endif
+
xmlfiles = $(man_MANS:.7=.xml)
%.1 %.5 %.7 %.8: %.xml
diff --git a/heartbeat/Makefile.am b/heartbeat/Makefile.am
index ff73a15aa..409847970 100644
--- a/heartbeat/Makefile.am
+++ b/heartbeat/Makefile.am
@@ -162,7 +162,6 @@ ocf_SCRIPTS = AoEtarget \
portblock \
postfix \
pound \
- powervs-subnet \
proftpd \
rabbitmq-cluster \
rabbitmq-server-ha \
@@ -207,6 +206,10 @@ if BUILD_GCP_VPC_MOVE_VIP
ocf_SCRIPTS += gcp-vpc-move-vip
endif
+if BUILD_POWERVS_SUBNET
+ocf_SCRIPTS += powervs-subnet
+endif
+
ocfcommondir = $(OCF_LIB_DIR_PREFIX)/heartbeat
ocfcommon_DATA = ocf-shellfuncs \
ocf-binaries \

15
resource-agents.spec
View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 81%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 82%{?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
@ -142,7 +142,7 @@ Patch89: RHEL-61888-ocf-shellfuncs-only-create-update-reload-systemd-drop-in-if-
Patch90: RHEL-62200-IPaddr2-improve-fail-logic-check-ip_status-after-adding-IP.patch
Patch91: RHEL-40589-azure-events-az-update-API-versions-add-retry-for-metadata.patch
Patch92: RHEL-58632-azure-events-use-node-name-from-cluster.patch
Patch93: RHEL-42513-powervs-subnet-new-ra.patch
Patch93: RHEL-42513-1-powervs-subnet-new-ra.patch
Patch94: RHEL-66292-1-aws-agents-reuse-imds-token-until-it-expires.patch
Patch95: RHEL-66292-2-aws-agents-reuse-imds-token-improvements.patch
Patch96: RHEL-68739-awsvip-add-interface-parameter.patch
@ -164,6 +164,9 @@ Patch111: RHEL-7688-IPaddr2-add-link-status-DOWN-LOWERLAYERDOWN-check.patch
Patch112: RHEL-97123-Filesystem-fix-issue-with-Vormetric-mounts.patch
Patch113: RHEL-102727-ocf-shellfuncs-remove-extra-sleep-from-curl_retry.patch
Patch114: RHEL-102610-podman-etcd-add-oom-parameter.patch
Patch115: RHEL-42513-2-build-dont-build-powervs-subnet-if-dependencies-are-missing.patch
Patch116: RHEL-114489-1-powervs-move-ip-new-ra.patch
Patch117: RHEL-114489-2-powervs-move-ip-set-bundled-path.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -402,6 +405,9 @@ exit 1
%patch -p1 -P 112
%patch -p1 -P 113
%patch -p1 -P 114
%patch -p1 -P 115 -F2
%patch -p1 -P 116
%patch -p1 -P 117
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -731,6 +737,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Mon Sep 15 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-82
- powervs-move-ip: new resource agent
Resolves: RHEL-114489
* Tue Sep 9 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-81
- podman-etcd: add oom parameter to be able to tune the Out-Of-Memory (OOM)
score for etcd containers