Merge "Write clouds.yaml to /etc as well"

This commit is contained in:
Jenkins 2015-10-20 04:02:04 +00:00 committed by Gerrit Code Review
commit b10c6205d2

@ -76,9 +76,11 @@ function write_clouds_yaml {
# The location is a variable to allow for easier refactoring later to make it
# overridable. There is currently no usecase where doing so makes sense, so
# it's not currently configurable.
CLOUDS_YAML=~/.config/openstack/clouds.yaml
for clouds_path in /etc/openstack ~/.config/openstack ; do
CLOUDS_YAML=$clouds_path/clouds.yaml
mkdir -p $(dirname $CLOUDS_YAML)
sudo mkdir -p $(dirname $CLOUDS_YAML)
sudo chown -R $STACK_USER $(dirname $CLOUDS_YAML)
CA_CERT_ARG=''
if [ -f "$SSL_BUNDLE_FILE" ]; then
@ -104,6 +106,7 @@ function write_clouds_yaml {
--os-username admin \
--os-password $ADMIN_PASSWORD \
--os-project-name admin
done
}
# trueorfalse <True|False> <VAR>