Remove NUMNODES and WITH_TSM_NODE configuration variables

[autocluster.git] / config.d / 60tsm.defconf

diff --git a/config.d/60tsm.defconf b/config.d/60tsm.defconf
index 1e22f1d2e094674820ce210b9e5354f368b8e929..e0ed1c6843c7ec8765479ed0e3cce19aa884431d 100644 (file)
--- a/config.d/60tsm.defconf
+++ b/config.d/60tsm.defconf
@@ -1,8 +1,5 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!
 
-defconf WITH_TSM_NODE "" \
-       "<0|1>" "1 if a TSM node should be created"
-
 defconf TSMDISKSIZE "50G" \
        "<n>G" "size of the TSM storage disk"
 
@@ -32,43 +29,20 @@ register_hook hack_nodes_functions hack_nodes_tsm_server
 
 hack_nodes_tsm_server ()
 {
-
-    # Compatibility code to handle WITH_TSM_NODE.
-    if [ "$WITH_TSM_NODE" = 0  -a "${NODES/tsm_server:/}" != "$NODES" ] ; then
-       # No tsm_server nodes desired but some configured - remove,
-       # see create_node_null.
-       NODES="${NODES//tsm_server:/null:}"
-    elif [ "$WITH_TSM_NODE" = 1 -a "${NODES/tsm_server:/}" = "$NODES" ] ; then
-       # tsm_server desired but none configured.  Try to create one
-       # at IP offset 0.
-       local n
-       for n in $NODES ; do
-           case "$n" in
-               *:0)
-                   die "Can't use WITH_TSM_NODE to add tsm_server node at IP offset 0 because this offset is already in use.  You need to set NODES instead - please read the documentation."
-           esac
-       done
-       NODES="${NODES}${NODES:+ }tsm_server:0"
-    fi
-
-    if [ "${NODES/tsm_server:/}" != "$NODES" ] ; then
-       
-       local node_count_tsm_server=0
-       # If only 1 tsm_server node then don't number it.
-       [ "${NODES/tsm_server:/}" = "${NODES//tsm_server:/}" ] && \
-           node_count_tsm_server=""
-       hack_filter ()
-       {
-           case "$node_type" in
-               tsm_server)
-                   [ -n "$node_count_tsm_server" ] && \
-                       node_count_tsm_server=$(($node_count_tsm_server + 1))
-                   name="${CLUSTER}tsm${node_count_tsm_server}"
-                   ctdb_node=0
-           esac
-       }
-       hack_all_nodes_with hack_filter
-    fi
+    local node_count_tsm_server=0
+    # If only 1 tsm_server node then don't number it.
+    [ "${NODES/tsm_server:/}" = "${NODES//tsm_server:/}" ] && \
+       node_count_tsm_server=""
+    hack_filter ()
+    {
+       if [ "$node_type" = "tsm_server" ] ; then
+           [ -n "$node_count_tsm_server" ] && \
+               node_count_tsm_server=$(($node_count_tsm_server + 1))
+           name="${CLUSTER}tsm${node_count_tsm_server}"
+           ctdb_node=0
+       fi
+    }
+    hack_all_nodes_with hack_filter
 }
 
 create_node_tsm_server ()