Merge "Create clouds.yaml early enough"
diff --git a/stack.sh b/stack.sh
index 8a8e3ea..bcd9db1 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1090,6 +1090,9 @@
 
 source $TOP_DIR/userrc_early
 
+# Write a clouds.yaml file
+write_clouds_yaml
+
 if is_service_enabled keystone; then
     echo_summary "Starting Keystone"
 
@@ -1118,9 +1121,6 @@
 
 fi
 
-# Write a clouds.yaml file
-write_clouds_yaml
-
 # Horizon
 # -------