diff --git a/SOURCES/bz1822250-aws-vpc-move-ip-delete-remaining-route-entries.patch b/SOURCES/bz1822250-aws-vpc-move-ip-delete-remaining-route-entries.patch new file mode 100644 index 0000000..85355b3 --- /dev/null +++ b/SOURCES/bz1822250-aws-vpc-move-ip-delete-remaining-route-entries.patch @@ -0,0 +1,24 @@ +From 390d1cb8b057ef0e6869fb57dc1e6b6997af49f0 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Fri, 3 Apr 2020 16:10:04 +0200 +Subject: [PATCH] aws-vpc-move-ip: delete remaining route entries + +--- + heartbeat/aws-vpc-move-ip | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/heartbeat/aws-vpc-move-ip b/heartbeat/aws-vpc-move-ip +index 97a467217..26ca6007d 100755 +--- a/heartbeat/aws-vpc-move-ip ++++ b/heartbeat/aws-vpc-move-ip +@@ -256,6 +256,10 @@ ec2ip_drop() { + return $OCF_ERR_GENERIC + fi + ++ # delete remaining route-entries if any ++ ip route show to exact ${OCF_RESKEY_ip}/32 dev $OCF_RESKEY_interface | xargs -r ip route delete ++ ip route show table local to exact ${OCF_RESKEY_ip}/32 dev $OCF_RESKEY_interface | xargs -r ip route delete ++ + return $OCF_SUCCESS + } + diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 70c7b75..aa69629 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.1.1 -Release: 44%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 44%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -188,6 +188,7 @@ Patch101: bz1744224-IPsrcaddr-4-fix-hardcoded-device.patch Patch102: bz1792196-rabbitmq-cluster-delete-nodename-when-stop-fails.patch Patch103: bz1808468-1-lvmlockd-fix-conditionals.patch Patch104: bz1808468-2-remove-locking_type.patch +Patch105: bz1822250-aws-vpc-move-ip-delete-remaining-route-entries.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -441,6 +442,7 @@ exit 1 %patch102 -p1 %patch103 -p1 %patch104 -p1 +%patch105 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -985,6 +987,11 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Wed Apr 15 2020 Oyvind Albrigtsen - 4.1.1-44.1 +- aws-vpc-move-ip: delete remaining route entries + + Resolves: rhbz#1822250 + * Fri Mar 6 2020 Oyvind Albrigtsen - 4.1.1-44 - lvmlockd: automatically remove locking_type from lvm.conf for LVM v2.03+