summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-06-27 12:25:53 +1000
committerMartin Schwenke <martin@meltin.net>2014-07-02 14:17:18 +1000
commitf9e3e0cbbe931b1d4dcbfbf2607f2f1f5c8bdb75 (patch)
tree28f19157134618c8d2151a336f35e332d91cea29
parent38cef6cddeb4f526144634bfc073d525fd139abf (diff)
downloadautocluster-f9e3e0cbbe931b1d4dcbfbf2607f2f1f5c8bdb75.tar.gz
autocluster-f9e3e0cbbe931b1d4dcbfbf2607f2f1f5c8bdb75.tar.xz
autocluster-f9e3e0cbbe931b1d4dcbfbf2607f2f1f5c8bdb75.zip
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>
-rw-r--r--config.d/00base.defconf6
-rw-r--r--config.d/50sofs.defconf6
2 files changed, 6 insertions, 6 deletions
diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index d58ee03..7511e8a 100644
--- 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 053775a..c83e558 100644
--- 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}"