Merge "Write out a clouds.yaml file"

This commit is contained in:
Jenkins 2015-05-21 16:01:08 +00:00 committed by Gerrit Code Review
commit eb38bd7602
2 changed files with 24 additions and 1 deletions

View File

@ -129,7 +129,7 @@ if [[ -n "$SCREEN_LOGDIR" ]] && [[ -d "$SCREEN_LOGDIR" ]]; then
fi fi
# Clean up venvs # Clean up venvs
DIRS_TO_CLEAN="$WHEELHOUSE ${PROJECT_VENV[@]}" DIRS_TO_CLEAN="$WHEELHOUSE ${PROJECT_VENV[@]} .config/openstack"
rm -rf $DIRS_TO_CLEAN rm -rf $DIRS_TO_CLEAN
# Clean up files # Clean up files

View File

@ -1294,6 +1294,29 @@ for i in BASE_SQL_CONN ENABLED_SERVICES HOST_IP LOGFILE \
echo $i=${!i} >>$TOP_DIR/.stackenv echo $i=${!i} >>$TOP_DIR/.stackenv
done done
# Write out a clouds.yaml file
# putting the location into a variable to allow for easier refactoring later
# to make it overridable. There is current no usecase where doing so makes
# sense, so I'm not actually doing it now.
CLOUDS_YAML=~/.config/openstack/clouds.yaml
if [ ! -e $CLOUDS_YAML ]; then
mkdir -p $(dirname $CLOUDS_YAML)
cat >"$CLOUDS_YAML" <<EOF
clouds:
devstack:
auth:
auth_url: $KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION
username: demo
project_name: demo
password: $ADMIN_PASSWORD
region_name: $REGION_NAME
identity_api_version: $IDENTITY_API_VERSION
EOF
if [ -f "$SSL_BUNDLE_FILE" ]; then
echo " cacert: $SSL_BUNDLE_FILE" >>"$CLOUDS_YAML"
fi
fi
# Wrapup configuration # Wrapup configuration
# ==================== # ====================