commit 1b01139eabfdb060730b8d1b180a07640b3549c0
author Jenkins <jenkins@review.openstack.org> Fri Nov 16 03:44:14 2012 +0000
committer Gerrit Code Review <review@openstack.org> Fri Nov 16 03:44:14 2012 +0000
tree 9dac15422cf52e7960c97826e059b914661fef6c
parent d957bc4ac9ae274e4e65f9e60c9ab413ebc88e2d
parent c1b486a520dd3c2c9596244a0aa899f2e35ec3bf

Merge "Simplify database selection"

tools/configure_tempest.sh

diff --git a/tools/configure_tempest.sh b/tools/configure_tempest.sh
index b48680c..6493822 100755
--- a/tools/configure_tempest.sh
+++ b/tools/configure_tempest.sh
@@ -128,7 +128,7 @@
 # OS_USERNAME et all should be defined in openrc.
 OS_USERNAME=${OS_USERNAME:-demo}
 OS_TENANT_NAME=${OS_TENANT_NAME:-demo}
-OS_PASSWORD=${OS_PASSWORD:$ADMIN_PASSWORD}
+OS_PASSWORD=${OS_PASSWORD:-$ADMIN_PASSWORD}
 
 # See files/keystone_data.sh where alt_demo user
 # and tenant are set up...