Skip to content

Commit db25bf8

Browse files
committed
Changed provision_opts from string to array
1 parent 5332042 commit db25bf8

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

OCNE/scripts/provision.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -386,27 +386,27 @@ quick_install_ocne() {
386386
api_server=$(ip -f inet addr show eth1| sed -En -e 's/.*inet ([0-9.]+).*/\1/p')
387387
fi
388388

389-
provision_opts=" --api-server ${api_server} --control-plane-nodes ${CONTROL_PLANES} --worker-nodes ${WORKERS}"
390-
provision_opts+=" --environment-name ${OCNE_ENV_NAME} --name ${OCNE_CLUSTER_NAME}"
391-
provision_opts+=" --container-registry ${REGISTRY_OCNE}"
392-
provision_opts+=" --selinux enforcing"
389+
provision_opts=(--api-server "${api_server}" --control-plane-nodes "${CONTROL_PLANES}" --worker-nodes "${WORKERS}")
390+
provision_opts=("${provision_opts[@]}" --environment-name "${OCNE_ENV_NAME}" --name "${OCNE_CLUSTER_NAME}")
391+
provision_opts=("${provision_opts[@]}" --container-registry "${REGISTRY_OCNE}")
392+
provision_opts=("${provision_opts[@]}" --selinux enforcing)
393393

394394
if [[ ${MULTI_CONTROL_PLANE} == 1 ]]; then
395-
provision_opts+=" --virtual-ip ${SUBNET}.99"
395+
provision_opts=("${provision_opts[@]}" --virtual-ip "${SUBNET}".99)
396396
fi
397397

398398
if [[ -n ${HTTP_PROXY} ]]; then
399-
provision_opts+=" --http-proxy ${HTTP_PROXY}"
400-
provision_opts+=" --https-proxy ${HTTPS_PROXY}"
401-
provision_opts+=" --no-proxy ${NO_PROXY}"
399+
provision_opts=("${provision_opts[@]}" --http-proxy "${HTTP_PROXY}")
400+
provision_opts=("${provision_opts[@]}" --https-proxy "${HTTPS_PROXY}")
401+
provision_opts=("${provision_opts[@]}" --no-proxy "${NO_PROXY}")
402402
fi
403403

404404
if [[ ${VERBOSE} == 1 ]]; then
405-
provision_opts+=" --debug"
405+
provision_opts=("${provision_opts[@]}" --debug)
406406
fi
407407

408408
msg "Provision the OCNE cluster with quick install"
409-
echo_do olcnectl provision ${provision_opts} --yes --timeout 20
409+
echo_do olcnectl provision "${provision_opts[@]}" --yes --timeout 20
410410

411411
msg "Update config to avoid having to enter the --api-server option in future olcnectl commands"
412412
echo_do olcnectl module instances \
@@ -590,7 +590,7 @@ deploy_modules() {
590590
--gluster-server-url "${HEKETI_CLI_SERVER}"
591591

592592
# Validate the Gluster module
593-
msg "Validating the Gluster module: ${Gluster_MODULE_NAME}"
593+
msg "Validating the Gluster module: ${GLUSTER_MODULE_NAME}"
594594
echo_do olcnectl module validate \
595595
--environment-name "${OCNE_ENV_NAME}" \
596596
--name "${GLUSTER_MODULE_NAME}"

0 commit comments

Comments
 (0)