Limit functionality of rhel_base nodes

They are not part of the CTDB cluster and do not have shared disks.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index d58ee03abea19494a82c4bae3ce194e39ddc2267..7511e8a40217df846d28fbed985b02753ca98438 100644 (file)
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -532,7 +532,8 @@ hack_nodes_rhel_base ()
            rhel_base)
                node_count_rhel_base=$(($node_count_rhel_base + 1))
                name="${CLUSTER}base${node_count_rhel_base}"
-               ctdb_node=1
+               # rhel_base nodes are not part of CTDB cluster
+               ctdb_node=0
            esac
     }
     hack_all_nodes_with hack_filter
@@ -544,6 +545,9 @@ create_node_rhel_base ()
     local name="$2"
     local ctdb_node="$3"
 
+    # rhel_base nodes do not have shared disks
+    local SHAREDDISK_TEMPLATE=""
+
     echo "Creating RHEL base node $name"
     create_node_COMMON "$name" "$ip_offset" "$type"
 }

diff --git a/config.d/50sofs.defconf b/config.d/50sofs.defconf
index 053775a8c6f2cbd690bb3a5676076da26a79f9bd..c83e55800f478718fe9c7245b12991b7203efbeb 100644 (file)
--- a/config.d/50sofs.defconf
+++ b/config.d/50sofs.defconf
@@ -7,8 +7,7 @@ NSD_SERVERS=
 hack_nodes_sofs ()
 {
     if [ "${NODES/sofs_*:/}" != "$NODES" ] ; then
-       # We have sofs_* nodes so name and tag them.  Also untag any
-       # rhel_base nodes.
+       # We have sofs_* nodes so name and tag them.
        local node_count_sofs_front=0
        local node_count_sofs_storage=0
        hack_filter ()
@@ -22,9 +21,6 @@ hack_nodes_sofs ()
            }
 
            case "$node_type" in
-               rhel_base)
-                   ctdb_node=0
-                   ;;
                sofs_front)
                    node_count_sofs_front=$(($node_count_sofs_front + 1))
                    name="${CLUSTER}front${node_count_sofs_front}"