Wire in OPENSTACK_VENV_DIR default if set

Updates the various environment.d elements which setup
{SERVICENAME}_VENV_DIR so that if OPENSTACK_VENV_DIR is set
it is used as a default. The in-element service name variable
if set will still override any OPENSTACK_VENV_DIR so that
per element exclusions can be made for any global venv.

Change-Id: Iba9d957f3e89c22bad9e32fa63095b7ad50fe503
This commit is contained in:
Dan Prince
2014-02-27 15:37:07 -05:00
parent 205fcae8a5
commit 8bb76dc020
13 changed files with 39 additions and 13 deletions

View File

@@ -1 +1,3 @@
export TUSKAR_VENV_DIR=${TUSKAR_VENV_DIR:-"/opt/stack/venvs/tuskar"}
if [ -z "${TUSKAR_VENV_DIR:-}" ]; then
export TUSKAR_VENV_DIR=${OPENSTACK_VENV_DIR:-"/opt/stack/venvs/tuskar"}
fi