Fully switch to bootstrap-leader for command-line args

multinode-demo/setup.sh

@@ -23,7 +23,7 @@ Creates a fullnode configuration
                   may be a private IP address unaccessible on the Intenet (default)
  -p             - Detect public address using public Internet servers
  -t node_type   - Create configuration files only for this kind of node.  Valid
-                  options are bootstrap_leader or fullnode.  Creates configuration files
+                  options are bootstrap-leader or fullnode.  Creates configuration files
                   for both by default
 
 EOF
@@ -52,7 +52,7 @@ while getopts "h?n:lpt:" opt; do
   t)
     node_type="$OPTARG"
     case $OPTARG in
-    bootstrap_leader|leader) # TODO: Remove legacy 'leader' option
+    bootstrap-leader|leader) # TODO: Remove legacy 'leader' option
       bootstrap_leader=true
       fullnode=false
       ;;

net/net.sh

@@ -183,7 +183,7 @@ startBootstrapNode() {
     esac
 
     ssh "${sshOptions[@]}" -n "$ipAddress" \
-      "./solana/net/remote/remote-node.sh $deployMethod bootstrap_fullnode $publicNetwork $entrypointIp $expectedNodeCount \"$RUST_LOG\""
+      "./solana/net/remote/remote-node.sh $deployMethod bootstrap-leader $publicNetwork $entrypointIp $expectedNodeCount \"$RUST_LOG\""
   ) >> "$logFile" 2>&1 || {
     cat "$logFile"
     echo "^^^ +++"

net/remote/remote-node.sh

@@ -42,7 +42,7 @@ fi
 case $deployMethod in
 snap)
   SECONDS=0
-  [[ $nodeType = bootstrap_fullnode ]] ||
+  [[ $nodeType = bootstrap-leader ]] ||
     net/scripts/rsync-retry.sh -vPrc "$entrypointIp:~/solana/solana.snap" .
   sudo snap install solana.snap --devmode --dangerous
 
@@ -63,7 +63,7 @@ snap)
     echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   fi
 
-  if [[ $nodeType = bootstrap-fullnode ]]; then
+  if [[ $nodeType = bootstrap-leader ]]; then
     nodeConfig="mode=bootstrap-leader+drone $commonNodeConfig"
     ln -sf -T /var/snap/solana/current/bootstrap-leader/current fullnode.log
     ln -sf -T /var/snap/solana/current/drone/current drone.log
@@ -104,12 +104,12 @@ local|tar)
   scripts/net-stats.sh  > net-stats.log 2>&1 &
 
   case $nodeType in
-  bootstrap_fullnode)
+  bootstrap-leader)
     if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-fullnode-cuda ]]; then
       echo Selecting solana-fullnode-cuda
       export SOLANA_CUDA=1
     fi
-    ./multinode-demo/setup.sh -t bootstrap_leader $setupArgs
+    ./multinode-demo/setup.sh -t bootstrap-leader $setupArgs
     ./multinode-demo/drone.sh > drone.log 2>&1 &
     ./multinode-demo/bootstrap-leader.sh > bootstrap-leader.log 2>&1 &
     ln -sTf bootstrap-leader.log fullnode.log