Merge "prepare_env.sh: fix some shellcheck warnings"

1 files changed, 15 insertions, 14 deletions

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 37b72b369..886e50e21 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -19,7 +19,8 @@
 
 # Extract network name from EXTERNAL_NETWORK
 #  e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24'
-export EXTERNAL_NETWORK=$(echo $EXTERNAL_NETWORK | cut -f1 -d \;)
+EXTERNAL_NETWORK=$(echo ${EXTERNAL_NETWORK} | cut -f1 -d \;)
+export EXTERNAL_NETWORK
 
 # Create openstack credentials
 echo "INFO: Creating openstack credentials .."
@@ -39,11 +40,11 @@ fi
 export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME
 
 # Prepare a admin-rc file for StorPerf integration
-$YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh
+"${YARDSTICK_REPO_DIR}"/tests/ci/prepare_storperf_admin-rc.sh
 
 # copy Storperf related files to the deployment location
 if [ "$INSTALLER_TYPE" == "compass" ]; then
-    source $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh
+    . "${YARDSTICK_REPO_DIR}"/tests/ci/scp_storperf_files.sh
 fi
 
 # Fetching id_rsa file from jump_server..."
@@ -51,7 +52,7 @@ verify_connectivity() {
     local ip=$1
     echo "Verifying connectivity to $ip..."
     for i in $(seq 0 10); do
-        if ping -c 1 -W 1 $ip > /dev/null; then
+        if ping -c 1 -W 1 "${ip}" > /dev/null; then
             echo "$ip is reachable!"
             return 0
         fi
@@ -65,34 +66,34 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 if [ "$INSTALLER_TYPE" == "fuel" ]; then
 
     # check the connection
-    verify_connectivity $INSTALLER_IP
+    verify_connectivity "${INSTALLER_IP}"
 
     pod_yaml="$YARDSTICK_REPO_DIR/etc/yardstick/nodes/fuel_baremetal/pod.yaml"
 
     # update "ip" according to the CI env
-    ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
+    ssh -l ubuntu "${INSTALLER_IP}" -i ${SSH_KEY} ${ssh_options} \
          "sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4  --out yaml">node_info
 
-    controller_ips=($(cat node_info|awk '/ctl/{getline; print $2}'))
-    compute_ips=($(cat node_info|awk '/cmp/{getline; print $2}'))
+    controller_ips=($(awk '/ctl/{getline; print $2} < node_info'))
+    compute_ips=($(awk '/cmp/{getline; print $2} < node_info'))
 
     if [[ ${controller_ips[0]} ]]; then
-        sed -i "s|ip1|${controller_ips[0]}|" $pod_yaml;
+        sed -i "s|ip1|${controller_ips[0]}|" "${pod_yaml}"
     fi
     if [[ ${controller_ips[1]} ]]; then
-        sed -i "s|ip2|${controller_ips[1]}|" $pod_yaml;
+        sed -i "s|ip2|${controller_ips[1]}|" "${pod_yaml}"
     fi
     if [[ ${controller_ips[2]} ]]; then
-        sed -i "s|ip3|${controller_ips[2]}|" $pod_yaml;
+        sed -i "s|ip3|${controller_ips[2]}|" "${pod_yaml}"
     fi
     if [[ ${compute_ips[0]} ]]; then
-        sed -i "s|ip4|${compute_ips[0]}|" $pod_yaml;
+        sed -i "s|ip4|${compute_ips[0]}|" "${pod_yaml}"
     fi
     if [[ ${compute_ips[1]} ]]; then
-        sed -i "s|ip5|${compute_ips[1]}|" $pod_yaml;
+        sed -i "s|ip5|${compute_ips[1]}|" "${pod_yaml}"
     fi
 
     # update 'user' and 'key_filename' according to the CI env
-    sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" $pod_yaml;
+    sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" "${pod_yaml}"
 
 fi