From 010bda5490093653a32378417c0e1d7af9d120ab Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Fri, 26 Jul 2024 10:29:39 +0200 Subject: [PATCH] - Rebase to resource-agents 4.15.1 upstream release - IPaddr2: change default for lvs_ipv6_addrlabel to true to avoid last added IP becoming src IP - powervs-subnet: new resource agent Resolves: RHEL-50378, RHEL-46557, RHEL-50380 --- resource-agents.spec | 19 ++++++++++++++----- sources | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/resource-agents.spec b/resource-agents.spec index eeddc3f..2e71985 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -20,7 +20,7 @@ # %global upstream_prefix ClusterLabs-resource-agents -%global upstream_version 92a213d8 +%global upstream_version a6ccb93a # Whether this platform defaults to using systemd as an init system # (needs to be evaluated prior to BuildRequires being enumerated and @@ -44,7 +44,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts -Version: 4.15.0 +Version: 4.15.1 Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPL-2.0-or-later AND LGPL-2.1-or-later URL: https://github.com/ClusterLabs/resource-agents @@ -96,6 +96,9 @@ BuildRequires: libglue-devel BuildRequires: libxslt docbook_4 docbook-xsl-stylesheets %endif +# dependencies for powervs-subnet +BuildRequires: python3-requests python3-urllib3 + ## Runtime deps # system tools shared by several agents Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk @@ -172,6 +175,7 @@ License: GPLv2+ and LGPLv2+ Summary: Cloud resource agents Requires: %{name} = %{version}-%{release} Requires: ha-cloud-support +Requires: python3-requests python3-urllib3 Requires: socat Provides: resource-agents-aliyun Obsoletes: resource-agents-aliyun <= %{version} @@ -327,6 +331,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %exclude %{_mandir}/man7/*aliyun-vpc-move-ip* %exclude /usr/lib/ocf/resource.d/heartbeat/gcp* %exclude %{_mandir}/man7/*gcp* +%exclude /usr/lib/ocf/resource.d/heartbeat/powervs-subnet +%exclude %{_mandir}/man7/*powervs-subnet* %exclude /usr/lib/ocf/resource.d/heartbeat/pgsqlms %exclude %{_mandir}/man7/*pgsqlms* %exclude %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm @@ -499,6 +505,8 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_mandir}/man7/*azure-* /usr/lib/ocf/resource.d/heartbeat/gcp-* %{_mandir}/man7/*gcp-* +/usr/lib/ocf/resource.d/heartbeat/powervs-subnet +%{_mandir}/man7/*powervs-subnet* %exclude /usr/lib/ocf/resource.d/heartbeat/gcp-vpc-move-ip %exclude %{_mandir}/man7/*gcp-vpc-move-ip* %endif @@ -512,12 +520,13 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Wed Jul 24 2024 Oyvind Albrigtsen - 4.15.0-1 -- Rebase to resource-agents 4.15.0 upstream release. +* Fri Jul 26 2024 Oyvind Albrigtsen - 4.15.1-1 +- Rebase to resource-agents 4.15.1 upstream release - IPaddr2: change default for lvs_ipv6_addrlabel to true to avoid last added IP becoming src IP +- powervs-subnet: new resource agent - Resolves: RHEL-50378, RHEL-46557 + Resolves: RHEL-50378, RHEL-46557, RHEL-50380 * Thu Jun 27 2024 Oyvind Albrigtsen - 4.13.0-6 - apache: prefer curl due to wget2 issues, and dont use -L for wget2 diff --git a/sources b/sources index e7389d9..99c0d03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ClusterLabs-resource-agents-92a213d8.tar.gz) = 6d3fcc8118bf531bedb86e4099faacdcb6f229529f6a21c4e99d436a1c309cc3dfba5d91d7c8870db8dc639d415f763310318775f0b37351bc2862376cff9eb7 +SHA512 (ClusterLabs-resource-agents-a6ccb93a.tar.gz) = 3ea92f051f16efbd0845d193cc7d2e7d8e9f66ba8e2bbba3a7b8d093ceff3103f8077b93037067dee8962a7d5c1ad0a0b5642acbaf385b0619cef96f18928911