Skip to content

Commit dfce5af

Browse files
committed
Update bootstrap-cluster.sh to extra parts param as array
1 parent c156658 commit dfce5af

1 file changed

Lines changed: 17 additions & 8 deletions

File tree

bare-metal/bootstrap-cluster.sh

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ print_help() {
5454
echo " --cleanup cleans up the cluster before deployment"
5555
echo " --is-single-node Deploy as single-node cluster (optional)"
5656
echo " --extra-cluster-args <value> Additional arguments to pass to cluster create command (optional)"
57+
echo " Example: --extra-cluster-args \"--log-del-interval 10 --cap-warn 80\""
5758
echo " --extra-sn-args <value> Additional arguments to pass to storage-node add-node command (optional)"
59+
echo " Example: --extra-sn-args \"--spdk-debug --enable-test-device\""
60+
echo " Example: --extra-sn-args \"--host-nqn /home/ec2-user/host-nqn.json\""
5861
echo " --help Print this help message"
5962
exit 0
6063
}
@@ -111,8 +114,8 @@ CLEAN_UP="false"
111114
PROXY_URL="http://34.1.171.127:5000"
112115
INSECURE_URL="34.1.171.127:5000"
113116

114-
EXTRA_CLUSTER_ARGS=""
115-
EXTRA_SN_ARGS=""
117+
EXTRA_SN_ARGS=()
118+
EXTRA_CLUSTER_ARGS=()
116119

117120
while [[ $# -gt 0 ]]; do
118121
arg="$1"
@@ -268,13 +271,13 @@ while [[ $# -gt 0 ]]; do
268271
IS_SINGLE_NODE="$2"
269272
shift
270273
;;
271-
--extra-cluster-args)
272-
EXTRA_CLUSTER_ARGS="$2"
274+
--extra-sn-args)
275+
read -r -a EXTRA_SN_ARGS <<< "$2"
273276
shift
274277
;;
275278

276-
--extra-sn-args)
277-
EXTRA_SN_ARGS="$2"
279+
--extra-cluster-args)
280+
read -r -a EXTRA_CLUSTER_ARGS <<< "$2"
278281
shift
279282
;;
280283
--help)
@@ -410,7 +413,10 @@ bootstrap_cluster() {
410413
[[ -n "$MODE" ]] && command+=" --mode $MODE"
411414
[[ -n "$MODE" && "$MODE" == "kubernetes" ]] && command+=" --mgmt-ip $mgmt_ip"
412415
[[ -z "$MODE" || "$MODE" == "docker" ]] && command+=" --ifname eth0"
413-
[[ -n "$EXTRA_CLUSTER_ARGS" ]] && command+=" $EXTRA_CLUSTER_ARGS"
416+
# [[ -n "$EXTRA_CLUSTER_ARGS" ]] && command+=" $EXTRA_CLUSTER_ARGS"
417+
for arg in "${EXTRA_CLUSTER_ARGS[@]}"; do
418+
command+=" $arg"
419+
done
414420

415421
ssh_exec "$mgmt_ip" "$command"
416422
}
@@ -512,7 +518,10 @@ add_storage_nodes() {
512518
[[ -n "$HA_JM_COUNT" ]] && add_cmd+=" --ha-jm-count $HA_JM_COUNT"
513519
[[ -n "$JM_PERCENT" ]] && add_cmd+=" --jm-percent $JM_PERCENT"
514520
[[ -n "$PARTITION_SIZE" ]] && add_cmd+=" --size-of-device $PARTITION_SIZE"
515-
[[ -n "$EXTRA_SN_ARGS" ]] && add_cmd+=" $EXTRA_SN_ARGS"
521+
# [[ -n "$EXTRA_SN_ARGS" ]] && add_cmd+=" $EXTRA_SN_ARGS"
522+
for arg in "${EXTRA_SN_ARGS[@]}"; do
523+
add_cmd+=" $arg"
524+
done
516525

517526
ssh_exec "${mnodes[0]}" "
518527
for node in ${storage_private_ips}; do

0 commit comments

Comments
 (0)