rgmanager: Add IP "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 <[email protected]>

---
 rgmanager/src/resources/ip.sh |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

rgmanager/src/resources/ip.sh +17 -0

index 38d1ab9..3adbb12 100755
@@ -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

Hi Ryan,

only one comment here.. many times we have been asked to implement "interface" parameter to allow any random IP on any specific interface (beside the pre configured ip on that interface).

Quoted 5 lines · Fabio M. Di Nitto

Hi Ryan,

only one comment here.. many times we have been asked to implement "interface" parameter to allow any random IP on any specific interface (beside the pre configured ip on that interface).

We haven't done that because we might end up owning routing. However, if we make it explicit that this is not the case, then we could in theory do both.

Quoted 10 lines · Lon Hohberger

Quoted 5 lines · Fabio M. Di Nitto

Hi Ryan,

only one comment here.. many times we have been asked to implement "interface" parameter to allow any random IP on any specific interface (beside the pre configured ip on that interface).

We haven't done that because we might end up owning routing. However, if we make it explicit that this is not the case, then we could in theory do both.

hmm right.. forgot about that.

I would still prefer to avoid the use of interface="" option if possible tho. Maybe something slightly less overloaded. force_interface or force_net_device.

Quoted 12 lines · Fabio M. Di Nitto

Quoted 10 lines · Lon Hohberger

Quoted 5 lines · Fabio M. Di Nitto

Hi Ryan,

only one comment here.. many times we have been asked to implement "interface" parameter to allow any random IP on any specific interface (beside the pre configured ip on that interface).

We haven't done that because we might end up owning routing. However, if we make it explicit that this is not the case, then we could in theory do both.

Quoted 6 lines

hmm right.. forgot about that.

I would still prefer to avoid the use of interface="" option if possible tho. Maybe something slightly less overloaded. force_interface or force_net_device.

Sure; that's fine.

prefer_interface=""

maybe? "If more than one match, use this one, otherwise, use the one that matches"

Quoted 4 lines · Lon Hohberger

Sure; that's fine.

prefer_interface=""

Quoted 2 lines

maybe? "If more than one match, use this one, otherwise, use the one that matches"

Yes that sounds a lot better than force_* :)

Thanks
Fabio

Quoted 5 lines · Fabio M. Di Nitto

Quoted 4 lines · Lon Hohberger

Sure; that's fine.

prefer_interface=""

Quoted 7 lines

Quoted 2 lines

maybe? "If more than one match, use this one, otherwise, use the one that matches"

Yes that sounds a lot better than force_* :)

Thanks
Fabio

Works for me.

New patch:

This patch adds a "prefer_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 <[email protected]>

---
 rgmanager/src/resources/ip.sh |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

rgmanager/src/resources/ip.sh +17 -0

index 38d1ab9..bbd85f3 100755
@@ -132,6 +132,15 @@ meta_data()
 	    <content type="boolean"/>
 	</parameter>
 
+	<parameter name="prefer_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_prefer_interface" ] && \
+			   [ "$OCF_RESKEY_prefer_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_prefer_interface" ] && \
+			   [ "$OCF_RESKEY_prefer_interface" != $dev ]; then
+				continue
+			fi
 		        ipv4_same_subnet $ifaddr/$maskbits $addr
 			if [ $? -ne 0 ]; then
 			        continue

Quoted 12 lines · Fabio M. Di Nitto

Quoted 10 lines · Lon Hohberger

Quoted 5 lines · Fabio M. Di Nitto

Hi Ryan,

only one comment here.. many times we have been asked to implement "interface" parameter to allow any random IP on any specific interface (beside the pre configured ip on that interface).

We haven't done that because we might end up owning routing. However, if we make it explicit that this is not the case, then we could in theory do both.

Quoted 6 lines

hmm right.. forgot about that.

I would still prefer to avoid the use of interface="" option if possible tho. Maybe something slightly less overloaded. force_interface or force_net_device.

Sure; that's fine.

prefer_interface=""

maybe? "If more than one match, use this one, otherwise, use the one that matches"