Browse code

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 ee9bb76647e1424e0dc84d32df6ab8607dc4ec96)

Conflicts:
functions-common

Change-Id: I036704734785958c95d2234917d7b40bd797a375

Monty Taylor authored on 2015/10/20 04:16:18
Showing 1 changed files
... ...
@@ -76,9 +76,11 @@ function write_clouds_yaml {
76 76
     # The location is a variable to allow for easier refactoring later to make it
77 77
     # overridable. There is currently no usecase where doing so makes sense, so
78 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 85
     CA_CERT_ARG=''
84 86
     if [ -f "$SSL_BUNDLE_FILE" ]; then