| commit | 99ea3ad7c38ff8619ace331a7c80a3f742a9c68a | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Feb 11 17:07:53 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Feb 11 17:07:53 2014 +0000 |
| tree | b4cd0256f4912775b46ecd0e36785ea2c4e9fee5 | |
| parent | 34b81e7a3974300122575e9615a6267bcc49c4f7 [diff] | |
| parent | 9e032c2d374f80612c010775dd8d71389d5d09a3 [diff] |
Merge "read_password needs to store in .localrc.auto if local.conf is used."
diff --git a/stack.sh b/stack.sh index 1a1460d..303541d 100755 --- a/stack.sh +++ b/stack.sh
@@ -362,7 +362,11 @@ var=$1; msg=$2 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 [ ! $pw ]; then