|
 |
b4b3ce |
From 34b46b172857babbb2bca5e012c7827ed6a26b01 Mon Sep 17 00:00:00 2001
|
|
|
b4b3ce |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
b4b3ce |
Date: Wed, 6 Nov 2019 10:00:31 +0100
|
|
|
b4b3ce |
Subject: [PATCH] IPaddr2: add noprefixroute parameter
|
|
|
b4b3ce |
|
|
|
b4b3ce |
---
|
|
|
b4b3ce |
heartbeat/IPaddr2 | 17 ++++++++++++++++-
|
|
|
b4b3ce |
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
b4b3ce |
|
|
|
b4b3ce |
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
|
|
|
b4b3ce |
index 1d39ae514..6f8e8c734 100755
|
|
|
b4b3ce |
--- a/heartbeat/IPaddr2
|
|
|
b4b3ce |
+++ b/heartbeat/IPaddr2
|
|
|
b4b3ce |
@@ -88,6 +88,7 @@ OCF_RESKEY_arp_sender_default=""
|
|
|
b4b3ce |
OCF_RESKEY_send_arp_opts_default=""
|
|
|
b4b3ce |
OCF_RESKEY_flush_routes_default="false"
|
|
|
b4b3ce |
OCF_RESKEY_run_arping_default=false
|
|
|
b4b3ce |
+OCF_RESKEY_noprefixroute_default="false"
|
|
|
b4b3ce |
OCF_RESKEY_preferred_lft_default="forever"
|
|
|
b4b3ce |
OCF_RESKEY_network_namespace_default=""
|
|
|
b4b3ce |
|
|
|
b4b3ce |
@@ -109,6 +110,7 @@ OCF_RESKEY_network_namespace_default=""
|
|
|
b4b3ce |
: ${OCF_RESKEY_send_arp_opts=${OCF_RESKEY_send_arp_opts_default}}
|
|
|
b4b3ce |
: ${OCF_RESKEY_flush_routes=${OCF_RESKEY_flush_routes_default}}
|
|
|
b4b3ce |
: ${OCF_RESKEY_run_arping=${OCF_RESKEY_run_arping_default}}
|
|
|
b4b3ce |
+: ${OCF_RESKEY_noprefixroute=${OCF_RESKEY_noprefixroute_default}}
|
|
|
b4b3ce |
: ${OCF_RESKEY_preferred_lft=${OCF_RESKEY_preferred_lft_default}}
|
|
|
b4b3ce |
: ${OCF_RESKEY_network_namespace=${OCF_RESKEY_network_namespace_default}}
|
|
|
b4b3ce |
|
|
|
b4b3ce |
@@ -377,6 +379,14 @@ Whether or not to run arping for IPv4 collision detection check.
|
|
|
b4b3ce |
<content type="string" default="${OCF_RESKEY_run_arping_default}"/>
|
|
|
b4b3ce |
</parameter>
|
|
|
b4b3ce |
|
|
|
b4b3ce |
+<parameter name="noprefixroute">
|
|
|
b4b3ce |
+<longdesc lang="en">
|
|
|
b4b3ce |
+Use noprefixroute flag (see 'man ip-address').
|
|
|
b4b3ce |
+</longdesc>
|
|
|
b4b3ce |
+<shortdesc lang="en">Use noprefixroute flag</shortdesc>
|
|
|
b4b3ce |
+<content type="string" default="${OCF_RESKEY_noprefixroute_default}"/>
|
|
|
b4b3ce |
+</parameter>
|
|
|
b4b3ce |
+
|
|
|
b4b3ce |
<parameter name="preferred_lft">
|
|
|
b4b3ce |
<longdesc lang="en">
|
|
|
b4b3ce |
For IPv6, set the preferred lifetime of the IP address.
|
|
|
b4b3ce |
@@ -397,8 +407,8 @@ the namespace.
|
|
|
b4b3ce |
<shortdesc lang="en">Network namespace to use</shortdesc>
|
|
|
b4b3ce |
<content type="string" default="${OCF_RESKEY_network_namespace_default}"/>
|
|
|
b4b3ce |
</parameter>
|
|
|
b4b3ce |
-
|
|
|
b4b3ce |
</parameters>
|
|
|
b4b3ce |
+
|
|
|
b4b3ce |
<actions>
|
|
|
b4b3ce |
<action name="start" timeout="20s" />
|
|
|
b4b3ce |
<action name="stop" timeout="20s" />
|
|
|
b4b3ce |
@@ -640,6 +650,11 @@ add_interface () {
|
|
|
b4b3ce |
msg="Adding $FAMILY address $ipaddr/$netmask with broadcast address $broadcast to device $iface"
|
|
|
b4b3ce |
fi
|
|
|
b4b3ce |
|
|
|
b4b3ce |
+ if ocf_is_true "${OCF_RESKEY_noprefixroute}"; then
|
|
|
b4b3ce |
+ cmd="$cmd noprefixroute"
|
|
|
b4b3ce |
+ msg="${msg} (with noprefixroute)"
|
|
|
b4b3ce |
+ fi
|
|
|
b4b3ce |
+
|
|
|
b4b3ce |
if [ ! -z "$label" ]; then
|
|
|
b4b3ce |
cmd="$cmd label $label"
|
|
|
b4b3ce |
msg="${msg} (with label $label)"
|