openstack/devstack
Code Issues Proposed changes

Merge "read_password needs to store in .localrc.auto if local.conf is used."

Browse Source
This commit is contained in:
Jenkins
2014-02-11 17:07:53 +00:00
committed by Gerrit Code Review
parent 34b81e7a39 9e032c2d37
commit 99ea3ad7c3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@@ -362,7 +362,11 @@ function read_password {
var=$1; msg=$2 var=$1; msg=$2
pw=${!var} pw=${!var}
localrc=$TOP_DIR/localrc if [[ -f $RC_DIR/localrc ]]; then
localrc=$TOP_DIR/localrc
else
localrc=$TOP_DIR/.localrc.auto
fi
# If the password is not defined yet, proceed to prompt user for a password. # If the password is not defined yet, proceed to prompt user for a password.
if [ ! $pw ]; then if [ ! $pw ]; then