diff --git a/SOURCES/bz2093214-aws-vpc-move-ip-add-interface-label-support.patch b/SOURCES/bz2093214-aws-vpc-move-ip-add-interface-label-support.patch
new file mode 100644
index 0000000..d1a611c
--- /dev/null
+++ b/SOURCES/bz2093214-aws-vpc-move-ip-add-interface-label-support.patch
@@ -0,0 +1,82 @@
+From 4420ef84f3172c67fc7b8b6ae41ea173de017bf4 Mon Sep 17 00:00:00 2001
+From: Petr Pavlu <petr.pavlu@suse.com>
+Date: Wed, 25 May 2022 15:12:33 +0200
+Subject: [PATCH] aws-vpc-move-ip: Allow to set the interface label
+
+Add a parameter to specify an interface label to distinguish the IP
+address managed by aws-vpc-move-ip, similarly as can be done with
+IPaddr2. This allows to easily recognize the address from other
+addresses assigned to a given interface.
+---
+ heartbeat/aws-vpc-move-ip | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip
+index 5d5204080..dee040300 100755
+--- a/heartbeat/aws-vpc-move-ip
++++ b/heartbeat/aws-vpc-move-ip
+@@ -43,6 +43,7 @@ OCF_RESKEY_address_default=""
+ OCF_RESKEY_routing_table_default=""
+ OCF_RESKEY_routing_table_role_default=""
+ OCF_RESKEY_interface_default="eth0"
++OCF_RESKEY_iflabel_default=""
+ OCF_RESKEY_monapi_default="false"
+ OCF_RESKEY_lookup_type_default="InstanceId"
+
+@@ -54,6 +55,7 @@ OCF_RESKEY_lookup_type_default="InstanceId"
+ : ${OCF_RESKEY_routing_table=${OCF_RESKEY_routing_table_default}}
+ : ${OCF_RESKEY_routing_table_role=${OCF_RESKEY_routing_table_role_default}}
+ : ${OCF_RESKEY_interface=${OCF_RESKEY_interface_default}}
++: ${OCF_RESKEY_iflabel=${OCF_RESKEY_iflabel_default}}
+ : ${OCF_RESKEY_monapi=${OCF_RESKEY_monapi_default}}
+ : ${OCF_RESKEY_lookup_type=${OCF_RESKEY_lookup_type_default}}
+
+@@ -149,6 +151,18 @@ Name of the network interface, i.e. eth0
+ <content type="string" default="${OCF_RESKEY_interface_default}" />
+ </parameter>
+
++<parameter name="iflabel">
++<longdesc lang="en">
++You can specify an additional label for your IP address here.
++This label is appended to your interface name.
++
++The kernel allows alphanumeric labels up to a maximum length of 15
++characters including the interface name and colon (e.g. eth0:foobar1234)
++</longdesc>
++<shortdesc lang="en">Interface label</shortdesc>
++<content type="string" default="${OCF_RESKEY_iflabel_default}"/>
++</parameter>
++
+ <parameter name="monapi">
+ <longdesc lang="en">
+ Enable enhanced monitoring using AWS API calls to check route table entry
+@@ -215,6 +229,14 @@ ec2ip_validate() {
+ return $OCF_ERR_CONFIGURED
+ fi
+
++ if [ -n "$OCF_RESKEY_iflabel" ]; then
++ label=${OCF_RESKEY_interface}:${OFC_RESKEY_iflabel}
++ if [ ${#label} -gt 15 ]; then
++ ocf_exit_reason "Interface label [$label] exceeds maximum character limit of 15"
++ exit $OCF_ERR_CONFIGURED
++ fi
++ fi
++
+ TOKEN=$(curl -sX PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
+ EC2_INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id -H "X-aws-ec2-metadata-token: $TOKEN")
+
+@@ -363,7 +385,13 @@ ec2ip_get_and_configure() {
+
+ # Reconfigure the local ip address
+ ec2ip_drop
+- cmd="ip addr add ${OCF_RESKEY_ip}/32 dev $OCF_RESKEY_interface"
++
++ extra_opts=""
++ if [ -n "$OCF_RESKEY_iflabel" ]; then
++ extra_opts="$extra_opts label $OCF_RESKEY_interface:$OCF_RESKEY_iflabel"
++ fi
++
++ cmd="ip addr add ${OCF_RESKEY_ip}/32 dev $OCF_RESKEY_interface $extra_opts"
+ ocf_log debug "executing command: $cmd"
+ $cmd
+ rc=$?
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index c51de3c..1aa922f 100644
--- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec
@@ -66,7 +66,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.9.0
-Release: 20%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release: 21%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -106,6 +106,7 @@ Patch19: bz2072043-LVM-activate-fix-fence-issue.patch
Patch20: bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
Patch21: bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
Patch22: bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch
+Patch23: bz2093214-aws-vpc-move-ip-add-interface-label-support.patch
# bundle patches
Patch1000: 7-gcp-bundled.patch
@@ -302,6 +303,7 @@ exit 1
%patch20 -p1
%patch21 -p1
%patch22 -p1
+%patch23 -p1
chmod 755 heartbeat/nova-compute-wait
chmod 755 heartbeat/NovaEvacuate
@@ -874,6 +876,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
+* Thu Jun 9 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-21
+- aws-vpc-move-ip: add interface label support
+
+ Resolves: rhbz#2093214
+
* Wed Jun 8 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-20
- lvmlockd: fail when use_lvmlockd has not been set