diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-01-29 10:13:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-29 10:13:07 +0000 |
| commit | f3f08ae0fd69b26cac46351599b434c3312351bd (patch) | |
| tree | 05a8cb08ebd78506b429f033fc25d611996f1be6 | |
| parent | f0b15ad226719e08f453822aabcacba29c581889 (diff) | |
| parent | c2de083b7a7c746cb49228f02b0e11d7b2419126 (diff) | |
Merge "correct the lookup logic for scenario's xci_overrides"
| -rwxr-xr-x | xci/xci-deploy.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 908889c1..18c8bb22 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -137,9 +137,7 @@ echo "-------------------------------------------------------------------------" #------------------------------------------------------------------------------- # Get scenario variables overrides #------------------------------------------------------------------------------- -if [[ -f $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO:-_no_scenario_}/xci_overrides ]]; then - source $XCI_SCENARIOS_CACHE/$DEPLOY_SCENARIO/xci_overrides -fi +source $(find $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO} -name xci_overrides) &>/dev/null || : #------------------------------------------------------------------------------- # Start provisioning VM nodes |