ACK -- Lon
On 07/24/2012 01:37 PM, Ryan McCabe wrote: > On Sat, Jul 21, 2012 at 06:47:50AM +0200, Fabio M. Di Nitto wrote: >> On 07/20/2012 11:07 PM, Lon Hohberger wrote: >>> Sure; that's fine. >>> >>> prefer_interface="" >>> >>> 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 <rmcc...@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..bbd85f3 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="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 >
