diff options
| -rwxr-xr-x | ci/clean.sh | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 4 | ||||
| -rw-r--r-- | ci/util.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index dc76f323..42090069 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -13,7 +13,7 @@ #author: Tim Rozet (trozet@redhat.com) # Use default if no param passed -CONFIG=${1-"/var/opt/opnfv"} +CONFIG=${CONFIG:-'/var/opt/opnfv'} ##LIBRARIES source $CONFIG/lib/common-functions.sh diff --git a/ci/deploy.sh b/ci/deploy.sh index a9a9509e..ebcde335 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -38,8 +38,8 @@ declare -A NET_MAP SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error) DEPLOY_OPTIONS="" -RESOURCES=/var/opt/opnfv/images -CONFIG=/var/opt/opnfv +RESOURCES=${RESOURCES:-'/var/opt/opnfv/images'} +CONFIG=${CONFIG:-'/var/opt/opnfv'} OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network" # Netmap used to map networks to OVS bridge names NET_MAP['admin_network']="br-admin" @@ -2,7 +2,7 @@ # Utility script used to interact with a deployment # @author Tim Rozet (trozet@redhat.com) -CONFIG=/var/opt/opnfv +CONFIG=${CONFIG:-'/var/opt/opnfv'} VALID_CMDS="undercloud debug-stack -h --help" source $CONFIG/utility-functions.sh @@ -72,4 +72,4 @@ main() { parse_cmdline "$@" } -main "$@"
\ No newline at end of file +main "$@" |