diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 16:30:31 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 16:30:31 +0000 |
commit | bcc7e1a4f4928d6ff5dafdfc994162910a43baac (patch) | |
tree | 2bcc4e00a723d0a4437ffeb9e09f7f4611ec52a4 | |
parent | dcffea9184f4b2725fa4c9259c0d31eb92653b3e (diff) | |
parent | e8aa5d57d3f694707cb67a070bfd350c2994e9ad (diff) |
Merge "Write clouds.yaml to only /etc" into stable/libertyliberty-eol
-rw-r--r-- | functions-common | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/functions-common b/functions-common index 04f7c0f..d7573c4 100644 --- a/functions-common +++ b/functions-common | |||
@@ -76,9 +76,11 @@ function write_clouds_yaml { | |||
76 | # The location is a variable to allow for easier refactoring later to make it | 76 | # The location is a variable to allow for easier refactoring later to make it |
77 | # overridable. There is currently no usecase where doing so makes sense, so | 77 | # overridable. There is currently no usecase where doing so makes sense, so |
78 | # it's not currently configurable. | 78 | # it's not currently configurable. |
79 | CLOUDS_YAML=~/.config/openstack/clouds.yaml | ||
80 | 79 | ||
81 | mkdir -p $(dirname $CLOUDS_YAML) | 80 | CLOUDS_YAML=/etc/openstack/clouds.yaml |
81 | |||
82 | sudo mkdir -p $(dirname $CLOUDS_YAML) | ||
83 | sudo chown -R $STACK_USER /etc/openstack | ||
82 | 84 | ||
83 | CA_CERT_ARG='' | 85 | CA_CERT_ARG='' |
84 | if [ -f "$SSL_BUNDLE_FILE" ]; then | 86 | if [ -f "$SSL_BUNDLE_FILE" ]; then |