x/tobiko
Code Issues Proposed changes

Add support for clouds.yaml file in DevStack plugin

Browse Source 
Change-Id: I03c26d3fc30ad7ce172c2c5e7cd2b316f81729dc
This commit is contained in:
Federico Ressi 2019-10-01 08:32:00 +02:00
parent 7c98e5da30
commit e9a0120417
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -72,7 +72,7 @@ function configure_tobiko_keystone {
local tobiko_config=$1 local tobiko_config=$1
local api_version=${IDENTITY_API_VERSION} local api_version=${IDENTITY_API_VERSION}
if [ "${api_version}" == '2']; then if [ "${api_version}" == '2' ]; then
local auth_url=${KEYSTONE_AUTH_URI/v2.0} local auth_url=${KEYSTONE_AUTH_URI/v2.0}
else else
local auth_url=${KEYSTONE_AUTH_URI_V3:-${KEYSTONE_AUTH_URI/v3}} local auth_url=${KEYSTONE_AUTH_URI_V3:-${KEYSTONE_AUTH_URI/v3}}
@ -97,6 +97,7 @@ function configure_tobiko_keystone {
"${user_id}" \ "${user_id}" \
"${TOBIKO_KEYSTONE_USER_DOMAIN_NAME}") "${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 api_version "${api_version}"
iniset "${tobiko_config}" keystone auth_url "${auth_url}" iniset "${tobiko_config}" keystone auth_url "${auth_url}"
iniset "${tobiko_config}" keystone username "${TOBIKO_KEYSTONE_USERNAME}" iniset "${tobiko_config}" keystone username "${TOBIKO_KEYSTONE_USERNAME}"

1
devstack/settings
View File

@ -25,6 +25,7 @@ TOBIKO_CIRROS_PASSWORD=${TOBIKO_CIRROS_PASSWORD:-}
# --- Keystone settings --- # --- Keystone settings ---
# See ``lib/keystone`` where these users and tenants are set up # 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_USERNAME=${TOBIKO_KEYSTONE_USERNAME:-${ADMIN_USERNAME:-admin}}
TOBIKO_KEYSTONE_PASSWORD=${TOBIKO_KEYSTONE_PASSWORD:-${ADMIN_PASSWORD:-secret}} TOBIKO_KEYSTONE_PASSWORD=${TOBIKO_KEYSTONE_PASSWORD:-${ADMIN_PASSWORD:-secret}}
TOBIKO_KEYSTONE_PROJECT_NAME=${TOBIKO_KEYSTONE_PROJECT_NAME:-${ADMIN_TENANT_NAME:-admin}} TOBIKO_KEYSTONE_PROJECT_NAME=${TOBIKO_KEYSTONE_PROJECT_NAME:-${ADMIN_TENANT_NAME:-admin}}