Cherry pick "Fix quotes for IMAGE_NAME2"
Align release/2019.2.0 with master
Related-PROD: PROD-32143
Change-Id: I67e37a07ce778560b5fd79ffd0e5b92e99114a99
diff --git a/configure.sh b/configure.sh
index 35b1b8c..1bf9ba2 100755
--- a/configure.sh
+++ b/configure.sh
@@ -40,17 +40,17 @@
}
update_cacerts () {
- # configuring certificates file
- if [ -z ${OS_CACERT+x} ]; then
- echo '# No OS_CACERT is set, update of crt file skipped'
- else
- echo '# Adding custom certificates'
- ca=( $(find ${1} -name cacert.pem) )
- for crt in ${ca[@]}; do
- cat ${OS_CACERT} >>${crt}
- echo '-> ${crt}'
- done
- fi
+ # configuring certificates file
+ if [ -z ${OS_CACERT+x} ]; then
+ echo '# No OS_CACERT is set, update of crt file skipped'
+ else
+ echo '# Adding custom certificates'
+ ca=( $(find ${1} -name cacert.pem) )
+ for crt in ${ca[@]}; do
+ cat ${OS_CACERT} >>${crt}
+ echo '-> ${crt}'
+ done
+ fi
}
tempest_configuration () {
@@ -88,7 +88,7 @@
current_path=$(pwd)
# fetch image with exact name: testvm
IMAGE_NAME2=testvm
-IMAGE_REF2=$(glance image-list | grep '\b${IMAGE_NAME2}\b' | awk '{print $2}')
+IMAGE_REF2=$(glance image-list | grep "\b${IMAGE_NAME2}\b" | awk '{print $2}')
if [ "${IMAGE_REF2}" == "" ]; then
if [ "$PROXY" != "offline" ]; then
if [ -n "${PROXY}" ]; then
@@ -103,7 +103,7 @@
echo "MD5 should be ee1eca47dc88f4879d8a229cc70a07c6"
md5sum $current_path/cvp-configuration/cirros-0.3.4-x86_64-disk.img
glance image-create --name=${IMAGE_NAME2} --visibility=public --container-format=bare --disk-format=qcow2 < $current_path/cvp-configuration/cirros-0.3.4-x86_64-disk.img
- IMAGE_REF2=$(glance image-list | grep '\b${IMAGE_NAME2}\b' | awk '{print $2}')
+ IMAGE_REF2=$(glance image-list | grep "\b${IMAGE_NAME2}\b" | awk '{print $2}')
else
echo "Cirros image was not downloaded! Some tests may fail"
IMAGE_REF2=""