From e8aa5d57d3f694707cb67a070bfd350c2994e9ad Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 19 Oct 2015 15:16:18 -0400
Subject: [PATCH] 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
---
 functions-common | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/functions-common b/functions-common
index 04f7c0f411..d7573c4d3e 100644
--- a/functions-common
+++ b/functions-common
@@ -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