openstack
/
devstack
Code Issues Proposed changes

Write clouds.yaml to only /etc 

After having migrated the copies of clouds.yaml to just consume from
/etc, remove the duplicate copy.

(cherry picked from commit ee9bb76647)

Conflicts:
	functions-common

Change-Id: I036704734785958c95d2234917d7b40bd797a375
This commit is contained in:
Monty Taylor 2015-10-19 15:16:18 -04:00 committed by Raissa Sarmento
parent 0591b1a6a3
commit e8aa5d57d3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions-common
View File

@ -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
mkdir -p $(dirname $CLOUDS_YAML)
CLOUDS_YAML=/etc/openstack/clouds.yaml
sudo mkdir -p $(dirname $CLOUDS_YAML)
sudo chown -R $STACK_USER /etc/openstack
CA_CERT_ARG=''
if [ -f "$SSL_BUNDLE_FILE" ]; then