Browse Source

Merge "Write clouds.yaml to only /etc" into stable/liberty

Jenkins 2 years ago
parent
commit
bcc7e1a4f4
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      functions-common

+ 4
- 2
functions-common View File

@@ -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

Loading…
Cancel
Save