- IPaddr2/IPsrcaddr: support policy-based routing
Resolves: rhbz#2142518
This commit is contained in:
parent
1a22deab56
commit
e4471672ef
35
bz2142518-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
Normal file
35
bz2142518-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From da9e8e691f39494e14f8f11173b6ab6433384396 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||||
|
Date: Tue, 20 Jun 2023 14:19:23 +0200
|
||||||
|
Subject: [PATCH] findif.sh: fix table parameter so it uses main table by
|
||||||
|
default
|
||||||
|
|
||||||
|
---
|
||||||
|
heartbeat/findif.sh | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh
|
||||||
|
index 1a40cc9a4b..6c04c98c19 100644
|
||||||
|
--- a/heartbeat/findif.sh
|
||||||
|
+++ b/heartbeat/findif.sh
|
||||||
|
@@ -32,7 +32,7 @@ prefixcheck() {
|
||||||
|
getnetworkinfo()
|
||||||
|
{
|
||||||
|
local line netinfo
|
||||||
|
- ip -o -f inet route list match $OCF_RESKEY_ip table "${OCF_RESKEY_table=local}" scope host | (while read line;
|
||||||
|
+ ip -o -f inet route list match $OCF_RESKEY_ip table "${OCF_RESKEY_table:=main}" scope host | (while read line;
|
||||||
|
do
|
||||||
|
netinfo=`echo $line | awk '{print $2}'`
|
||||||
|
case $netinfo in
|
||||||
|
@@ -215,9 +215,9 @@ findif()
|
||||||
|
fi
|
||||||
|
if [ -n "$nic" ] ; then
|
||||||
|
# NIC supports more than two.
|
||||||
|
- set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
||||||
|
+ set -- $(ip -o -f $family route list match $match $scope table "${OCF_RESKEY_table:=main}" | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
||||||
|
else
|
||||||
|
- set -- $(ip -o -f $family route list match $match $scope | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
||||||
|
+ set -- $(ip -o -f $family route list match $match $scope table "${OCF_RESKEY_table:=main}" | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
||||||
|
fi
|
||||||
|
if [ $# = 0 ] ; then
|
||||||
|
case $OCF_RESKEY_ip in
|
@ -45,7 +45,7 @@
|
|||||||
Name: resource-agents
|
Name: resource-agents
|
||||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||||
Version: 4.10.0
|
Version: 4.10.0
|
||||||
Release: 39%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
Release: 40%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: https://github.com/ClusterLabs/resource-agents
|
URL: https://github.com/ClusterLabs/resource-agents
|
||||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||||
@ -93,7 +93,7 @@ Patch40: bz2157872-2-Filesystem-CTDB-validate-all-improvements.patch
|
|||||||
Patch41: bz2157872-3-pgsqlms-validate-all-OCF_CHECK_LEVEL-10.patch
|
Patch41: bz2157872-3-pgsqlms-validate-all-OCF_CHECK_LEVEL-10.patch
|
||||||
Patch42: bz2157872-4-exportfs-pgsql-validate-all-fixes.patch
|
Patch42: bz2157872-4-exportfs-pgsql-validate-all-fixes.patch
|
||||||
Patch43: bz2157872-5-pgsqlms-alidate-all-OCF_CHECK_LEVEL-10.patch
|
Patch43: bz2157872-5-pgsqlms-alidate-all-OCF_CHECK_LEVEL-10.patch
|
||||||
Patch44: bz2142518-IPaddr2-IPsrcaddr-support-policy-based-routing.patch
|
Patch44: bz2142518-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch
|
||||||
Patch45: bz2149968-lvmlockd-add-use_lvmlockd-if-missing.patch
|
Patch45: bz2149968-lvmlockd-add-use_lvmlockd-if-missing.patch
|
||||||
Patch46: bz2174896-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch
|
Patch46: bz2174896-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch
|
||||||
Patch47: bz2179003-mysql-1-replication-fixes.patch
|
Patch47: bz2179003-mysql-1-replication-fixes.patch
|
||||||
@ -103,6 +103,7 @@ Patch50: bz2182415-azure-events-2-improve-logic.patch
|
|||||||
Patch51: bz2183133-Filesystem-fail-efs-utils-not-installed.patch
|
Patch51: bz2183133-Filesystem-fail-efs-utils-not-installed.patch
|
||||||
Patch52: bz2184779-Filesystem-systemd-drop-in-net-fs.patch
|
Patch52: bz2184779-Filesystem-systemd-drop-in-net-fs.patch
|
||||||
Patch53: bz2179003-mysql-2-fix-demoted-score-bounce.patch
|
Patch53: bz2179003-mysql-2-fix-demoted-score-bounce.patch
|
||||||
|
Patch54: bz2142518-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch
|
||||||
|
|
||||||
# bundled ha-cloud-support libs
|
# bundled ha-cloud-support libs
|
||||||
Patch500: ha-cloud-support-aws.patch
|
Patch500: ha-cloud-support-aws.patch
|
||||||
@ -280,6 +281,7 @@ exit 1
|
|||||||
%patch51 -p1
|
%patch51 -p1
|
||||||
%patch52 -p1
|
%patch52 -p1
|
||||||
%patch53 -p1
|
%patch53 -p1
|
||||||
|
%patch54 -p1
|
||||||
|
|
||||||
# bundled ha-cloud-support libs
|
# bundled ha-cloud-support libs
|
||||||
%patch500 -p1
|
%patch500 -p1
|
||||||
@ -601,6 +603,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-40
|
||||||
|
- IPaddr2/IPsrcaddr: support policy-based routing
|
||||||
|
|
||||||
|
Resolves: rhbz#2142518
|
||||||
|
|
||||||
* Wed Jun 14 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-39
|
* Wed Jun 14 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-39
|
||||||
- mysql: fix replication issues
|
- mysql: fix replication issues
|
||||||
|
|
||||||
@ -626,11 +633,9 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
|
|||||||
Resolves: rhbz#2174911
|
Resolves: rhbz#2174911
|
||||||
|
|
||||||
* Tue Mar 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-35
|
* Tue Mar 21 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-35
|
||||||
- IPaddr2/IPsrcaddr: support policy-based routing
|
|
||||||
- lvmlockd: add "use_lvmlockd = 1" if it's commented out or missing
|
- lvmlockd: add "use_lvmlockd = 1" if it's commented out or missing
|
||||||
- ethmonitor: dont log "Interface does not exist" for monitor-action
|
- ethmonitor: dont log "Interface does not exist" for monitor-action
|
||||||
|
|
||||||
Resolves: rhbz#2142518
|
|
||||||
Resolves: rhbz#2149968
|
Resolves: rhbz#2149968
|
||||||
Resolves: rhbz#2174896
|
Resolves: rhbz#2174896
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user