# HG changeset patch
# User Keisuke MORI <kskmori@intellilink.co.jp>
# Date 1271816820 -32400
# Branch ipaddr
# Node ID 690879ec528e0227b8b3996834ec2fa170325cdf
# Parent  5d5053deb51d22493180bc40b7ad6ec5ba890968
IPaddr RA: Fix to return the correct OCF value when delete_interface failed.

diff -r 5d5053deb51d -r 690879ec528e heartbeat/IPaddr
--- a/heartbeat/IPaddr	Mon Apr 26 09:06:37 2010 +0200
+++ b/heartbeat/IPaddr	Wed Apr 21 11:27:00 2010 +0900
@@ -587,9 +587,10 @@
   rm -f "$VLDIR/$NIC"
 
   if [ $rc != 0 ]; then
-      ocf_log warn "IP Address $OCF_RESKEY_ip NOT released"
+      ocf_log warn "IP Address $OCF_RESKEY_ip NOT released: rc=$rc"
+      return $OCF_ERR_GENERIC
   fi
-  return $rc
+  return $OCF_SUCCESS
 }
 
 
# HG changeset patch
# User Keisuke MORI <kskmori@intellilink.co.jp>
# Date 1271823398 -32400
# Branch ipaddr
# Node ID 8c55f2664fe8ccb8a9b632492c9417156c884faf
# Parent  690879ec528e0227b8b3996834ec2fa170325cdf
IPaddr/IPaddr2 RA: add a description of the assumption in meta-data

diff -r 690879ec528e -r 8c55f2664fe8 heartbeat/IPaddr
--- a/heartbeat/IPaddr	Wed Apr 21 11:27:00 2010 +0900
+++ b/heartbeat/IPaddr	Wed Apr 21 13:16:38 2010 +0900
@@ -95,6 +95,16 @@
 Do NOT specify an alias interface in the form eth0:1 or anything here;
 rather, specify the base interface only.
 
+Prerequisite:
+
+There must be at least one static IP address, which is not managed by
+the cluster, assigned on the network interface.
+
+If you can not assign any static IP address on the interface,
+use the kernel parameter below:
+sysctl -w net.ipv4.conf.all.promote_secondaries=1
+(or per device)
+
 </longdesc>
 <shortdesc lang="en">Network interface</shortdesc>
 <content type="string" default="eth0"/>
diff -r 690879ec528e -r 8c55f2664fe8 heartbeat/IPaddr2
--- a/heartbeat/IPaddr2	Wed Apr 21 11:27:00 2010 +0900
+++ b/heartbeat/IPaddr2	Wed Apr 21 13:16:38 2010 +0900
@@ -111,6 +111,16 @@
 Do NOT specify an alias interface in the form eth0:1 or anything here;
 rather, specify the base interface only.
 
+Prerequisite:
+
+There must be at least one static IP address, which is not managed by
+the cluster, assigned on the network interface.
+
+If you can not assign any static IP address on the interface,
+use the kernel parameter below:
+sysctl -w net.ipv4.conf.all.promote_secondaries=1
+(or per device)
+
 </longdesc>
 <shortdesc lang="en">Network interface</shortdesc>
 <content type="string" default="eth0"/>