do not join fence domain by default

Most users do not configure fencing devices, so this just adds confusion. Hopefully we have some kind of self-fencing in future.

diff --git a/Makefile b/Makefile
index f42eb19f7962dd7f995bf811f2eddf24dbf28151..684cb75cc5091ac09a5464559c6626d98c4aee34 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ RHCDIR=cluster-${RHCVER}
 RHCSRC=${RHCDIR}.tar.gz
 
 PACKAGE=redhat-cluster-pve
-PKGREL=2
+PKGREL=3
 
 DEBS=                                                                  \
        ${PACKAGE}_${RHCVER}-${PKGREL}_amd64.deb                        \

diff --git a/debian/changelog b/debian/changelog
index 99a00e395e8827bb74d6f75581f2ed847baed01c..5c1f5bece0598558d787f8d0d8b026e757d0636b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+redhat-cluster-pve (3.1.8-3) unstable; urgency=low
+
+  * do not join fence domain by default
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 22 Dec 2011 09:57:56 +0100
+
 redhat-cluster-pve (3.1.8-2) unstable; urgency=low
 
   * fix schema to allow toplevel pvevm resource

diff --git a/debian/patches/fix-cman-init.diff b/debian/patches/fix-cman-init.diff
index a597e1d2a2ed0ceee6dfa817c1b2211332b9f8bb..d2183b63e1e19b48290a5b008bd986b1531a5217 100644 (file)
--- a/debian/patches/fix-cman-init.diff
+++ b/debian/patches/fix-cman-init.diff
@@ -3,8 +3,8 @@
 
 Index: new/cman/init.d/cman.in
 ===================================================================
---- new.orig/cman/init.d/cman.in       2010-12-02 07:19:35.000000000 +0100
-+++ new/cman/init.d/cman.in    2010-12-23 11:32:12.000000000 +0100
+--- new.orig/cman/init.d/cman.in       2011-12-22 09:52:56.000000000 +0100
++++ new/cman/init.d/cman.in    2011-12-22 09:55:29.000000000 +0100
 @@ -19,6 +19,8 @@
  # set secure PATH
  PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
@@ -14,3 +14,12 @@ Index: new/cman/init.d/cman.in
  chkconfig2()
  {
        case "$1" in
+@@ -129,7 +131,7 @@
+ #     set to "yes", then the script will attempt to join the fence domain.
+ #     If FENCE_JOIN is set to any other value, the default behavior is
+ #     to join the fence domain (equivalent to "yes").
+-[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes"
++[ -z "$FENCE_JOIN" ] && FENCE_JOIN="no"
+ 
+ # FENCED_OPTS -- allow extra options to be passed to fence daemon.
+ [ -z "$FENCED_OPTS" ] && FENCED_OPTS=""

diff --git a/debian/redhat-cluster-pve.default b/debian/redhat-cluster-pve.default
index 3b745756eb5bde31f83b7342813977bc56be5863..857e0957ea51e5e9787eddee613270a4c0557d33 100644 (file)
--- a/debian/redhat-cluster-pve.default
+++ b/debian/redhat-cluster-pve.default
@@ -5,3 +5,4 @@
 # CLUSTER_JOIN_OPTIONS=""
 # CLUSTER_SHUTDOWN_TIMEOUT=60
 # RGMGR_OPTIONS=""
+# FENCE_JOIN="yes"