diff options
| author |   mei mei <meimei@huawei.com> | 2018-10-17 01:44:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-17 01:44:49 +0000 |
| commit | 3f9fb3f3ad1bb8b56eaec535f11a523d3bfac4a2 (patch) | |
| tree | eeb492af6d00c0cd2b4f5fa61c3104dd309b72b2 | |
| parent | bede394dae3cc0f577a35a10880ea1f9fceeebbc (diff) | |
| parent | 8ca0b630db9e5c229663be2fbd4550bfee35f719 (diff) | |
Merge "[dovetail] Bugfix: incorrectly exit when file doesn't exist"
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 5fe3d36bb..95b5e215e 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -36,9 +36,9 @@ sshkey="" check_file_exists() { if [[ -f $1 ]]; then - return 0 + echo 0 else - return 1 + echo 1 fi } @@ -91,8 +91,8 @@ get_joid_cred_file() { } change_cred_file_cacert_path() { - check_file_exists ${CACERT} - if [[ $? == 0 ]]; then + exists=`check_file_exists ${CACERT}` + if [[ $exists == 0 ]]; then echo "INFO: set ${INSTALLER_TYPE} openstack cacert file to be ${CACERT}" if [[ ${INSTALLER_TYPE} == "compass" ]]; then echo "export OS_CACERT=${CACERT}" >> ${OPENRC} @@ -107,8 +107,8 @@ change_cred_file_cacert_path() { } change_cred_file_ext_net() { - check_file_exists ${OPENRC} - if [[ $? == 0 ]]; then + exists=`check_file_exists ${OPENRC}` + if [[ $exists == 0 ]]; then echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC} else echo "ERROR: cannot find file $OPENRC. Please check if it is existing." @@ -128,8 +128,8 @@ get_cred_file() { get_joid_cred_file fi - check_file_exists ${OPENRC} - if [[ $? == 0 ]]; then + exists=`check_file_exists ${OPENRC}` + if [[ $exists == 0 ]]; then echo "INFO: original openstack credentials file is" cat $OPENRC echo "INFO: change cacert file path in credentials file" |