From e9a01204176305811c0d91c222db638d111599ca Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Tue, 1 Oct 2019 08:32:00 +0200
Subject: [PATCH] Add support for clouds.yaml file in DevStack plugin

Change-Id: I03c26d3fc30ad7ce172c2c5e7cd2b316f81729dc
---
 devstack/plugin.sh | 3 ++-
 devstack/settings  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index ff245214a..d5d67d343 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -72,7 +72,7 @@ function configure_tobiko_keystone {
   local tobiko_config=$1
 
   local api_version=${IDENTITY_API_VERSION}
-  if [ "${api_version}" == '2']; then
+  if [ "${api_version}" == '2' ]; then
     local auth_url=${KEYSTONE_AUTH_URI/v2.0}
   else
     local auth_url=${KEYSTONE_AUTH_URI_V3:-${KEYSTONE_AUTH_URI/v3}}
@@ -97,6 +97,7 @@ function configure_tobiko_keystone {
     "${user_id}" \
     "${TOBIKO_KEYSTONE_USER_DOMAIN_NAME}")
 
+  iniset "${tobiko_config}" keystone cloud_name "${TOBIKO_KEYSTONE_CLOUD_NAME}"
   iniset "${tobiko_config}" keystone api_version "${api_version}"
   iniset "${tobiko_config}" keystone auth_url "${auth_url}"
   iniset "${tobiko_config}" keystone username "${TOBIKO_KEYSTONE_USERNAME}"
diff --git a/devstack/settings b/devstack/settings
index 33d9f2dfc..77709c74a 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -25,6 +25,7 @@ TOBIKO_CIRROS_PASSWORD=${TOBIKO_CIRROS_PASSWORD:-}
 
 # --- Keystone settings ---
 # See ``lib/keystone`` where these users and tenants are set up
+TOBIKO_KEYSTONE_CLOUD_NAME=${TOBIKO_KEYSTONE_CLOUD_NAME:-devstack-admin}
 TOBIKO_KEYSTONE_USERNAME=${TOBIKO_KEYSTONE_USERNAME:-${ADMIN_USERNAME:-admin}}
 TOBIKO_KEYSTONE_PASSWORD=${TOBIKO_KEYSTONE_PASSWORD:-${ADMIN_PASSWORD:-secret}}
 TOBIKO_KEYSTONE_PROJECT_NAME=${TOBIKO_KEYSTONE_PROJECT_NAME:-${ADMIN_TENANT_NAME:-admin}}