From d66a3df4d34e166a3839a29f15f82613f3cc42bd Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Wed, 6 Mar 2024 12:47:28 +0100 Subject: [PATCH] - aliyun-vpc-move-ip: use new aliyun-cli Resolves: RHEL-26666 --- ha-cloud-support-aliyun.patch | 2 +- resource-agents.spec | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ha-cloud-support-aliyun.patch b/ha-cloud-support-aliyun.patch index 93d78aa..d714729 100644 --- a/ha-cloud-support-aliyun.patch +++ b/ha-cloud-support-aliyun.patch @@ -6,7 +6,7 @@ diff --color -uNr a/heartbeat/aliyun-vpc-move-ip b/heartbeat/aliyun-vpc-move-ip OCF_RESKEY_profile_default="default" OCF_RESKEY_endpoint_default="vpc.aliyuncs.com" -OCF_RESKEY_aliyuncli_default="detect" -+OCF_RESKEY_aliyuncli_default="/usr/lib/fence-agents/support/aliyun/bin/aliyuncli" ++OCF_RESKEY_aliyuncli_default="/usr/lib/fence-agents/support/aliyun/aliyun-cli/aliyun" : ${OCF_RESKEY_address=${OCF_RESKEY_address_default}} diff --git a/resource-agents.spec b/resource-agents.spec index 5d11b08..e079dca 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: 52%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 53%{?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 @@ -214,7 +214,7 @@ service managers. License: GPLv2+ and LGPLv2+ Summary: Cloud resource agents Requires: %{name} = %{version}-%{release} -Requires: ha-cloud-support +Requires: ha-cloud-support >= 4.10.0-63 Requires: socat Provides: resource-agents-aliyun Obsoletes: resource-agents-aliyun <= %{version} @@ -633,6 +633,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Wed Mar 6 2024 Oyvind Albrigtsen - 4.10.0-53 +- aliyun-vpc-move-ip: use new aliyun-cli + + Resolves: RHEL-26666 + * Thu Feb 8 2024 Oyvind Albrigtsen - 4.10.0-52 - findif.sh: fix loopback IP handling