diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-09-21 14:13:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 14:13:59 +0000 |
| commit | 4523fd8c90acf923a526cae390922c1dbcd6220e (patch) | |
| tree | 641b5aaeefcfff9ba567b427aa6481255e22850b /ci | |
| parent | 8b6af178a5987f16325771691bde5956111cda01 (diff) | |
| parent | b6bda2fe154d067084a99733f42663252ff9b399 (diff) | |
Merge "Handling file loads and tmp dirs differently"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 39eba881..cd90511c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -36,6 +36,7 @@ declare -A deploy_options_array declare -a performance_options declare -A NET_MAP +APEX_TMP_DIR=$(python3 -c "import tempfile; print(tempfile.mkdtemp())") SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error) DEPLOY_OPTIONS="" CONFIG=${CONFIG:-'/var/opt/opnfv'} @@ -185,7 +186,7 @@ parse_cmdline() { echo -e "${red}ERROR: You should not specify an inventory file with virtual deployments${reset}" exit 1 else - INVENTORY_FILE='/tmp/inventory-virt.yaml' + INVENTORY_FILE="$APEX_TMP_DIR/inventory-virt.yaml" fi elif [[ -z "$INVENTORY_FILE" ]]; then echo -e "${red}ERROR: You must specify an inventory file for baremetal deployments! Exiting...${reset}" |