openstack/devstack
Code Issues Proposed changes

Fix upload_image error in stackrc

Browse Source 
This commit fixes error caused by adding default image path to IMAGE_URLS without ','
If user sets IMAGE_URLS in localrc like
IMAGE_URLS="path1, path2" (with a space after the comma)
the we get an error "binary operator expected" in
if [ -n $IMAGE_URLS ] condition and a comma will not be added to the end of IMAGE_URLS
In the code below we add default image path(path3) to IMAGE_URLS and we get
IMAGE_URLS="path1, path2path3"

Change-Id: I6543f7178c49a42c71ad9df4cdb4c6e78cbf7758
This commit is contained in:
Mikhail Feoktistov 2015-09-03 18:15:28 +03:00
parent 1d0b0d363e
commit 0c3a3b051e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stackrc
View File

@ -565,7 +565,7 @@ CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"}
# ``IMAGE_URLS`` to be set in the `localrc` section of ``local.conf``. # ``IMAGE_URLS`` to be set in the `localrc` section of ``local.conf``.
DOWNLOAD_DEFAULT_IMAGES=$(trueorfalse True DOWNLOAD_DEFAULT_IMAGES) DOWNLOAD_DEFAULT_IMAGES=$(trueorfalse True DOWNLOAD_DEFAULT_IMAGES)
if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
if [ -n $IMAGE_URLS ]; then if [[ -n "$IMAGE_URLS" ]]; then
IMAGE_URLS+="," IMAGE_URLS+=","
fi fi
case "$VIRT_DRIVER" in case "$VIRT_DRIVER" in