From ec2113f05c61fb47ab3e9e1dc5a2bbf35eb72bb2 Mon Sep 17 00:00:00 2001 From: Nolan Brubaker Date: Tue, 24 Mar 2015 12:40:32 -0400 Subject: [PATCH] Move SYMLINK_DIR declaration to bootstrap-aio.sh The gate-check-commit.sh script defined the SYMLINK_DIR variable, but it was only used in bootstrap-aio.sh. This meant that using bootstrap-aio.sh by itself would fail due to the undefined variable. This change moves the declaration to boostrap-aio.sh so that an AIO can be boostrapped without necessitating a gate check. Change-Id: Id1b20379c5837cdd4b3df03de42f0ea612e3fbb5 Closes-Bug: #1434315 --- scripts/bootstrap-aio.sh | 1 + scripts/gate-check-commit.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh index 6b6413fb08..184841bec7 100755 --- a/scripts/bootstrap-aio.sh +++ b/scripts/bootstrap-aio.sh @@ -29,6 +29,7 @@ export NOVA_VIRT_TYPE=${NOVA_VIRT_TYPE:-"qemu"} export TEMPEST_FLAT_CIDR=${TEMPEST_FLAT_CIDR:-"172.29.248.0/22"} export FLUSH_IPTABLES=${FLUSH_IPTABLES:-"yes"} export RABBITMQ_PACKAGE_URL=${RABBITMQ_PACKAGE_URL:-""} +export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"} # Default disabled fatal deprecation warnings export CINDER_FATAL_DEPRECATIONS=${CINDER_FATAL_DEPRECATIONS:-"no"} diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 37b4ae1a83..2fe0812de1 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -36,7 +36,6 @@ export DEPLOY_TEMPEST=${DEPLOY_TEMPEST:-"yes"} export MAX_RETRIES=${MAX_RETRIES:-"1"} # limit forks for gate check export FORKS=${FORKS:-10} -export SYMLINK_DIR=${SYMLINK_DIR:-"$(pwd)/logs"} # tempest and testr options, default is to run tempest in serial export RUN_TEMPEST_OPTS=${RUN_TEMPEST_OPTS:-'--serial'} export TESTR_OPTS=${TESTR_OPTS:-''}