Remove references to backup head nodes and RHEL6

Common/Sys-scripts/cluster-change-group-gid

@@ -59,4 +59,4 @@ if [ 0$proceed != 0Proceed ]; then
 fi
 
 auto-change-group-gid $group_name $new_gid $dirs || true
-cluster-run "auto-change-group-gid --silent $group_name $new_gid" backup io vis compute
+cluster-run "auto-change-group-gid --silent $group_name $new_gid" io vis compute

Common/Sys-scripts/cluster-change-primary-group

@@ -47,5 +47,5 @@ for dir in $dirs; do
 done
 
 auto-change-primary-group $user_name $new_group $dirs
-cluster-run "auto-change-primary-group $user_name $new_group" backup io vis compute
+cluster-run "auto-change-primary-group $user_name $new_group" io vis compute
 chgrp $new_group $LOCALBASE/etc/spcm/pw-age/$user_name

Common/Sys-scripts/cluster-change-uid

@@ -60,4 +60,4 @@ fi
 
 # Verify that uid is available on this host
 auto-change-uid $user_name $new_uid $dirs || true
-cluster-run "auto-change-uid --silent $user_name $new_uid" backup io vis compute
+cluster-run "auto-change-uid --silent $user_name $new_uid" io vis compute

Common/Sys-scripts/cluster-dist-file

@@ -14,7 +14,7 @@
 
 usage()
 {
-    printf "Usage: $0 local-path remote-path perms backup|compute|io|vis|all\n"
+    printf "Usage: $0 local-path remote-path perms compute|io|vis|all\n"
     exit 1
 }
 
@@ -43,7 +43,7 @@ shift; shift; shift
 
 node_types="$*"
 if [ "$node_types" = all ]; then
-    node_types="backup compute io vis"
+    node_types="compute io vis"
 fi
 
 for node_type in $node_types; do

Common/Sys-scripts/cluster-firewall-config

@@ -14,7 +14,7 @@
 
 usage()
 {
-    printf "Usage: $0 head|backup|io|compute|vis\n"
+    printf "Usage: $0 head|io|compute|vis\n"
     exit 1
 }
 
@@ -54,7 +54,7 @@ RHEL)
 
     node_type=$1
     case $node_type in
-    head|backup)
+    head)
 	# Allow http traffic from outside the cluster
 	firewall-cmd --permanent --add-service=http
 	firewall-cmd --permanent --add-service=tftp

Common/Sys-scripts/cluster-init-node

@@ -16,7 +16,7 @@
 
 usage()
 {
-    printf "Usage: $0 [--unattended] host.domain backup|compute|io|vis\n"
+    printf "Usage: $0 [--unattended] host.domain compute|io|vis\n"
     exit 1
 }
 
@@ -81,7 +81,7 @@ EOM
 fi
 
 case $node_type in
-backup|compute|io|vis)
+compute|io|vis)
     ;;
 *)
     usage

Common/Sys-scripts/cluster-ipmi-power-on

@@ -3,7 +3,7 @@
 ##########################################################################
 #   Synopsis:
 #       cluster-ipmi-power-on \
-#           [-f first-host] [-l last-host] head|backup|io|compute|vis|all
+#           [-f first-host] [-l last-host] head|io|compute|vis|all
 #
 #   Description:
 #       .B cluster-ipmi-power-on
@@ -52,7 +52,7 @@
 usage()
 {
     cat << EOM
-Usage: $0 [-f first-host] [-l last-host] head|backup|io|compute|vis|all
+Usage: $0 [-f first-host] [-l last-host] head|io|compute|vis|all
 EOM
     exit 1
 }
@@ -96,10 +96,6 @@ fi
 while [ $# -ge 1 ]; do
     node_type=$1
 
-    if [ $node_type = 'backup' ] || [ $node_type = 'all' ]; then
-	nodes=" `cluster-backup-nodes`"
-    fi
-
     if [ $node_type = 'io' ] || [ $node_type = 'all' ]; then
 	nodes="$nodes `cluster-file-servers`"
     fi

Common/Sys-scripts/cluster-ipmi-remote-access

@@ -12,7 +12,7 @@
 usage()
 {
     cat << EOM
-Usage: $0 [-f first-host] [-l last-host] head|backup|io|compute|vis|all
+Usage: $0 [-f first-host] [-l last-host] head|io|compute|vis|all
 EOM
     exit 1
 }
@@ -75,10 +75,6 @@ done
 while [ $# -ge 1 ]; do
     node_type=$1
 
-    if [ $node_type = 'backup' ] || [ $node_type = 'all' ]; then
-	nodes=" `cluster-backup-nodes`"
-    fi
-
     if [ $node_type = 'io' ] || [ $node_type = 'all' ]; then
 	nodes="$nodes `cluster-file-servers`"
     fi

Common/Sys-scripts/cluster-node-manager

@@ -124,30 +124,24 @@ get_node_type()
     while [ $node_type = none ]; do
 	cat << EOM
 
-1.. Backup head nodes
-2.. File servers
-3.. Compute nodes
-4.. Visualization nodes
+1.. File servers
+2.. Compute nodes
+3.. Visualization nodes
 
 EOM
 	read node_type
 	case $node_type in
 	1)
-	    node_type=head
-	    default_digits=1
-	    default_prefix=head-
-	    ;;
-	2)
 	    node_type=io
 	    default_digits=2
 	    default_prefix=raid-
 	    ;;
-	3)
+	2)
 	    node_type=compute
 	    default_digits=3
 	    default_prefix=compute-
 	    ;;
-	4)
+	3)
 	    node_type=vis
 	    default_digits=1
 	    default_prefix=vis-

Common/Sys-scripts/cluster-power-manager

@@ -48,14 +48,13 @@ Nodes must be configured for remote IPMI power-on to utilize the power on
 features here.  This may require some BIOS setup.  Use auto-ipmi-install and
 auto-ipmi-remote-access for the rest.
 
-1.. Power on backup head node
-2.. Power on file servers
-3.. Power on compute nodes
-4.. Power on vis nodes
-5.. Power on nodes by hostname
-6.. Shut down idle compute nodes
-7.. Power on drained compute nodes
-8.. Shut down cluster
+1.. Power on file servers
+2.. Power on compute nodes
+3.. Power on vis nodes
+4.. Power on nodes by hostname
+5.. Shut down idle compute nodes
+6.. Power on drained compute nodes
+7.. Shut down cluster
 Q.. Quit
 
 EOM
@@ -65,22 +64,18 @@ EOM
     clear
     case $selection in
     1)
-	cluster-ipmi-power-on backup
-	;;
-
-    2)
 	cluster-ipmi-power-on io
 	;;
 
-    3)
+    2)
 	cluster-ipmi-power-on compute
 	;;
 
-    4)
+    3)
 	cluster-ipmi-power-on vis
 	;;
 
-    5)
+    4)
 	printf "Enter hostnames separated by space\n"
 	read hostnames
 	for host in $hostnames; do
@@ -91,15 +86,15 @@ EOM
 	done
 	;;
 
-    6)
+    5)
 	cluster-power-saver
 	;;
 
-    7)
+    6)
 	cluster-power-waster
 	;;
 
-    8)
+    7)
 	cluster-shutdown
 	;;
 

Common/Sys-scripts/cluster-run

@@ -3,7 +3,7 @@
 usage()
 {
     cat << EOM
-Usage: $0 [-p] [-c] [-n] 'command' head|backup|io|compute|vis|all
+Usage: $0 [-p] [-c] [-n] 'command' head|io|compute|vis|all
     -c = continue running if there are errors.
     -p = run in parallel, redirecting output to files. (implies -c)
     -n = omit ssh -t flag to disable full terminal control.
@@ -64,10 +64,6 @@ while [ $# -gt 1 ]; do
 	nodes="$nodes localhost"
     fi
 
-    if [ $node_type = 'backup' ] || [ $node_type = 'all' ]; then
-	nodes="$nodes `cluster-backup-nodes`"
-    fi
-
     if [ $node_type = 'io' ] || [ $node_type = 'all' ]; then
 	nodes="$nodes `cluster-file-servers`"
     fi

Common/Sys-scripts/cluster-shutdown

@@ -60,11 +60,6 @@ if [ 0$(cluster-vis-nodes) != 0 ]; then
     read vis
 fi
 
-if [ 0$(cluster-backup-nodes) != 0 ]; then
-    printf "Shut down backup login nodes? (yes/[no]) "
-    read backup
-fi
-
 printf "Shut down head node? (yes/[no]) "
 read head
 
@@ -87,10 +82,6 @@ if [ 0$vis = 0yes ]; then
     cluster-run -c "shutdown $flag now" vis || true
 fi
 
-if [ 0$backup = 0yes ]; then
-    cluster-run -c "shutdown $flag now" backup || true
-fi
-
 if [ 0$head = 0yes ]; then
     shutdown $flag now
 fi

Common/Sys-scripts/cluster-slurm-enable

@@ -61,15 +61,6 @@ RHEL)
     chmod 644 $LOCALBASE/etc/slurm.conf
 
     case `auto-os-release` in
-    RHEL6)
-	rm -f /etc/init.d/slurm
-	ln -s $LOCALBASE/share/examples/slurm/init.d.slurm /etc/init.d/slurm
-	chmod 755 /etc/init.d/slurm
-
-	chkconfig slurm on
-	service slurm restart
-	;;
-
     RHEL7)
 	case $NODE_TYPE in
 	head)

Common/Sys-scripts/cluster-software-manager

@@ -46,7 +46,7 @@ select_node_type()
 	NODE_TYPE=''
 	available_node_types='all head'
 	printf "\n1.. All\n2.. head"
-	for node_type in backup raid vis compute; do
+	for node_type in io vis compute; do
 	    if [ "0$(cluster-$node_type-nodes)" != 0 ]; then
 		n=$((n + 1))
 		printf "\n$n.. $node_type"

Common/Sys-scripts/cluster-sync-pw

@@ -56,4 +56,5 @@ if [ "0$pw" = 0 ]; then
     exit 1
 fi
 
-$LOCALBASE/sbin/cluster-run -c "auto-transfer-pw $user_name '$pw'" backup io vis compute
+$LOCALBASE/sbin/cluster-run -c "auto-transfer-pw $user_name '$pw'" \
+    io vis compute

Common/Sys-scripts/cluster-sync-sysfiles

@@ -12,8 +12,7 @@ if ! cluster-check-cron-updates; then
     exit 0
 fi
 
-login_nodes="`cluster-backup-nodes`"
-root_nodes="`cluster-backup-nodes` `cluster-file-servers`"
+root_nodes="`cluster-file-servers`"
 all_nodes="`cluster-all-nodes`"
 
 # Select nodes of each category from list