From 9f858533b27893e2e2896f4a9a883419dcce2979 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Tue, 16 Feb 2021 12:45:28 +0100 Subject: [PATCH] - add BuildRequires for google lib - use HA cloud support supplied awscli --- ha-cloud-support-aws.patch | 48 ++++++++++++++++++++++++++++++++++++++ resource-agents.spec | 7 ++++-- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 ha-cloud-support-aws.patch diff --git a/ha-cloud-support-aws.patch b/ha-cloud-support-aws.patch new file mode 100644 index 0000000..d858d5a --- /dev/null +++ b/ha-cloud-support-aws.patch @@ -0,0 +1,48 @@ +diff --color -uNr a/heartbeat/awseip b/heartbeat/awseip +--- a/heartbeat/awseip 2020-12-03 14:31:17.000000000 +0100 ++++ b/heartbeat/awseip 2021-02-15 16:47:36.624610378 +0100 +@@ -43,7 +43,7 @@ + # + # Defaults + # +-OCF_RESKEY_awscli_default="/usr/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" + OCF_RESKEY_profile_default="default" + OCF_RESKEY_api_delay_default="3" + +diff --color -uNr a/heartbeat/awsvip b/heartbeat/awsvip +--- a/heartbeat/awsvip 2020-12-03 14:31:17.000000000 +0100 ++++ b/heartbeat/awsvip 2021-02-15 16:47:48.960632484 +0100 +@@ -42,7 +42,7 @@ + # + # Defaults + # +-OCF_RESKEY_awscli_default="/usr/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" + OCF_RESKEY_profile_default="default" + OCF_RESKEY_api_delay_default="3" + +diff --color -uNr a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip +--- a/heartbeat/aws-vpc-move-ip 2020-12-03 14:31:17.000000000 +0100 ++++ b/heartbeat/aws-vpc-move-ip 2021-02-15 16:47:55.484644118 +0100 +@@ -35,7 +35,7 @@ + . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs + + # Defaults +-OCF_RESKEY_awscli_default="/usr/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" + OCF_RESKEY_profile_default="default" + OCF_RESKEY_region_default="" + OCF_RESKEY_ip_default="" +diff --color -uNr a/heartbeat/aws-vpc-route53.in b/heartbeat/aws-vpc-route53.in +--- a/heartbeat/aws-vpc-route53.in 2020-12-03 14:31:17.000000000 +0100 ++++ b/heartbeat/aws-vpc-route53.in 2021-02-15 16:47:59.808651828 +0100 +@@ -45,7 +45,7 @@ + . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs + + # Defaults +-OCF_RESKEY_awscli_default="/usr/bin/aws" ++OCF_RESKEY_awscli_default="/usr/lib/fence-agents/support/aws/bin/aws" + OCF_RESKEY_profile_default="default" + OCF_RESKEY_hostedzoneid_default="" + OCF_RESKEY_fullname_default="" diff --git a/resource-agents.spec b/resource-agents.spec index d874bcc..8757aff 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -52,10 +52,12 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.7.0 -Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 3%{?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 +Patch0: ha-cloud-support-aws.patch + Obsoletes: heartbeat-resources <= %{version} Provides: heartbeat-resources = %{version} @@ -378,8 +380,9 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog -* Fri Feb 12 2021 Oyvind Albrigtsen - 4.7.0-2 +* Tue Feb 16 2021 Oyvind Albrigtsen - 4.7.0-3 - add BuildRequires for google lib +- use HA cloud support supplied awscli * Wed Jan 27 2021 Fedora Release Engineering - 4.7.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild