Attachment 597904 Details for Bug 819494 – fix

[patch] fix

0001-rgmanager-Add-interface-parameter.patch (text/plain), 1.98 KB, created by Ryan McCabe on 2012-07-12 20:49:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan McCabe

Created: 2012-07-12 20:49:35 UTC

Size: 1.98 KB

patch

obsolete

>From 1526ad1f81de6aaf041220bda26718dff9e3ace2 Mon Sep 17 00:00:00 2001
>From: Ryan McCabe <rmccabe@redhat.com>
>Date: Thu, 12 Jul 2012 13:15:14 -0400
>Subject: [PATCH] rgmanager: Add "interface" parameter
>
>This patch adds an "interface" parameter for IP resources. The
>interface must already be configured and active. This parameter
>should be used only when at least two active interfaces have IP
>addresses on the same subnet and it's necessary to specify which
>particular interface should be used.
>
>Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
>---
> rgmanager/src/resources/ip.sh |   17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
>diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
>index 38d1ab9..3adbb12 100755
>--- a/rgmanager/src/resources/ip.sh
>+++ b/rgmanager/src/resources/ip.sh
>@@ -132,6 +132,15 @@ meta_data()
> 	    <content type="boolean"/>
> 	</parameter>
> 
>+	<parameter name="interface">
>+	    <longdesc lang="en">
>+	        The network interface to which the IP address should be added. The interface must already be configured and active. This parameter should be used only when at least two active interfaces have IP addresses on the same subnet and it is desired to have the IP address added to a particular interface.
>+	    </longdesc>
>+	    <shortdesc lang="en">
>+	        Network interface
>+	    </shortdesc>
>+	    <content type="string"/>
>+	</parameter>
>     </parameters>
> 
>     <actions>
>@@ -587,6 +596,10 @@ ipv6()
> 		fi
> 		
> 		if [ "$1" = "add" ]; then
>+			if [ -n "$OCF_RESKEY_interface" ] && \
>+			   [ "$OCF_RESKEY_interface" != $dev ]; then
>+				continue
>+			fi
> 			ipv6_same_subnet $ifaddr_exp/$maskbits $addr_exp
> 			if [ $? -ne 0 ]; then
>                                 continue
>@@ -670,6 +683,10 @@ ipv4()
> 		fi
> 
> 		if [ "$1" = "add" ]; then
>+			if [ -n "$OCF_RESKEY_interface" ] && \
>+			   [ "$OCF_RESKEY_interface" != $dev ]; then
>+				continue
>+			fi
> 		        ipv4_same_subnet $ifaddr/$maskbits $addr
> 			if [ $? -ne 0 ]; then
> 			        continue
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 819494: 597904 | 600291