- powervs-subnet: new resource agent
Resolves: RHEL-42513
This commit is contained in:
parent
98e69c2d35
commit
e0e05d036c
1165
RHEL-42513-powervs-subnet-new-ra.patch
Normal file
1165
RHEL-42513-powervs-subnet-new-ra.patch
Normal file
File diff suppressed because it is too large
Load Diff
19
ha-cloud-support-ibm.patch
Normal file
19
ha-cloud-support-ibm.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- a/heartbeat/powervs-subnet.in 2024-10-18 10:59:30.418142172 +0200
|
||||||
|
+++ b/heartbeat/powervs-subnet.in 2024-10-18 12:30:15.954883160 +0200
|
||||||
|
@@ -33,9 +33,13 @@
|
||||||
|
import textwrap
|
||||||
|
import time
|
||||||
|
|
||||||
|
-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
|
||||||
|
|
||||||
|
OCF_FUNCTIONS_DIR = os.environ.get(
|
||||||
|
"OCF_FUNCTIONS_DIR", "%s/lib/heartbeat" % os.environ.get("OCF_ROOT")
|
@ -45,7 +45,7 @@
|
|||||||
Name: resource-agents
|
Name: resource-agents
|
||||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||||
Version: 4.10.0
|
Version: 4.10.0
|
||||||
Release: 67%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
Release: 68%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: https://github.com/ClusterLabs/resource-agents
|
URL: https://github.com/ClusterLabs/resource-agents
|
||||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||||
@ -142,10 +142,12 @@ 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
|
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
|
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
|
Patch92: RHEL-58632-azure-events-use-node-name-from-cluster.patch
|
||||||
|
Patch93: RHEL-42513-powervs-subnet-new-ra.patch
|
||||||
|
|
||||||
# bundled ha-cloud-support libs
|
# bundled ha-cloud-support libs
|
||||||
Patch500: ha-cloud-support-aliyun.patch
|
Patch500: ha-cloud-support-aliyun.patch
|
||||||
Patch501: ha-cloud-support-gcloud.patch
|
Patch501: ha-cloud-support-gcloud.patch
|
||||||
|
Patch502: ha-cloud-support-ibm.patch
|
||||||
|
|
||||||
Obsoletes: heartbeat-resources <= %{version}
|
Obsoletes: heartbeat-resources <= %{version}
|
||||||
Provides: heartbeat-resources = %{version}
|
Provides: heartbeat-resources = %{version}
|
||||||
@ -231,7 +233,7 @@ A set of scripts to interface with several services to operate in a
|
|||||||
High Availability environment for both Pacemaker and rgmanager
|
High Availability environment for both Pacemaker and rgmanager
|
||||||
service managers.
|
service managers.
|
||||||
|
|
||||||
%ifarch x86_64
|
%ifarch x86_64 ppc64le
|
||||||
%package cloud
|
%package cloud
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
Summary: Cloud resource agents
|
Summary: Cloud resource agents
|
||||||
@ -357,10 +359,12 @@ exit 1
|
|||||||
%patch -p1 -P 90
|
%patch -p1 -P 90
|
||||||
%patch -p1 -P 91
|
%patch -p1 -P 91
|
||||||
%patch -p1 -P 92
|
%patch -p1 -P 92
|
||||||
|
%patch -p1 -P 93
|
||||||
|
|
||||||
# bundled ha-cloud-support libs
|
# bundled ha-cloud-support libs
|
||||||
%patch -p1 -P 500
|
%patch -p1 -P 500
|
||||||
%patch -p1 -P 501
|
%patch -p1 -P 501
|
||||||
|
%patch -p1 -P 502
|
||||||
|
|
||||||
chmod 755 heartbeat/nova-compute-wait
|
chmod 755 heartbeat/nova-compute-wait
|
||||||
chmod 755 heartbeat/NovaEvacuate
|
chmod 755 heartbeat/NovaEvacuate
|
||||||
@ -491,6 +495,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||||||
%exclude %{_mandir}/man7/*aliyun-vpc-move-ip*
|
%exclude %{_mandir}/man7/*aliyun-vpc-move-ip*
|
||||||
%exclude /usr/lib/ocf/resource.d/heartbeat/gcp*
|
%exclude /usr/lib/ocf/resource.d/heartbeat/gcp*
|
||||||
%exclude %{_mandir}/man7/*gcp*
|
%exclude %{_mandir}/man7/*gcp*
|
||||||
|
%exclude /usr/lib/ocf/resource.d/heartbeat/powervs-*
|
||||||
|
%exclude %{_mandir}/man7/*powervs-*
|
||||||
%exclude /usr/lib/ocf/resource.d/heartbeat/pgsqlms
|
%exclude /usr/lib/ocf/resource.d/heartbeat/pgsqlms
|
||||||
%exclude %{_mandir}/man7/*pgsqlms*
|
%exclude %{_mandir}/man7/*pgsqlms*
|
||||||
%exclude %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
%exclude %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||||
@ -654,8 +660,9 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||||||
%{_libexecdir}/heartbeat
|
%{_libexecdir}/heartbeat
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch x86_64
|
%ifarch x86_64 ppc64le
|
||||||
%files cloud
|
%files cloud
|
||||||
|
%ifarch x86_64
|
||||||
/usr/lib/ocf/resource.d/heartbeat/aliyun-*
|
/usr/lib/ocf/resource.d/heartbeat/aliyun-*
|
||||||
%{_mandir}/man7/*aliyun-*
|
%{_mandir}/man7/*aliyun-*
|
||||||
/usr/lib/ocf/resource.d/heartbeat/aws*
|
/usr/lib/ocf/resource.d/heartbeat/aws*
|
||||||
@ -667,6 +674,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||||||
%exclude /usr/lib/ocf/resource.d/heartbeat/gcp-vpc-move-ip
|
%exclude /usr/lib/ocf/resource.d/heartbeat/gcp-vpc-move-ip
|
||||||
%exclude %{_mandir}/man7/*gcp-vpc-move-ip*
|
%exclude %{_mandir}/man7/*gcp-vpc-move-ip*
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch ppc64le
|
||||||
|
/usr/lib/ocf/resource.d/heartbeat/powervs-*
|
||||||
|
%{_mandir}/man7/*powervs-*
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%files paf
|
%files paf
|
||||||
%doc paf_README.md
|
%doc paf_README.md
|
||||||
@ -677,6 +689,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 23 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-68
|
||||||
|
- powervs-subnet: new resource agent
|
||||||
|
|
||||||
|
Resolves: RHEL-42513
|
||||||
|
|
||||||
* Mon Oct 14 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-67
|
* Mon Oct 14 2024 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-67
|
||||||
- ocf-shellfuncs: only create/update and reload systemd drop-in if
|
- ocf-shellfuncs: only create/update and reload systemd drop-in if
|
||||||
needed
|
needed
|
||||||
|
Loading…
Reference in New Issue
Block a user