[osclients] do not always strip auth_url
* add check that version suffix is presented in the auth_url of keystone before trying to crop it. * port devstack plugin to use AUTH_URL env variable Change-Id: Ib3c56ad0f945787d4df49308deb08bc87199c546
This commit is contained in:
parent
137c5bbe50
commit
43aff0ce17
@ -52,7 +52,7 @@ then
|
|||||||
"type": "ExistingCloud",
|
"type": "ExistingCloud",
|
||||||
"creds": {
|
"creds": {
|
||||||
"openstack": {
|
"openstack": {
|
||||||
"auth_url": "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION",
|
"auth_url": "$OS_AUTH_URL",
|
||||||
"region_name": "$REGION_NAME",
|
"region_name": "$REGION_NAME",
|
||||||
"admin": {
|
"admin": {
|
||||||
"username": "admin",
|
"username": "admin",
|
||||||
@ -71,7 +71,7 @@ then
|
|||||||
"type": "ExistingCloud",
|
"type": "ExistingCloud",
|
||||||
"creds": {
|
"creds": {
|
||||||
"openstack": {
|
"openstack": {
|
||||||
"auth_url": "$KEYSTONE_AUTH_URI_V3",
|
"auth_url": "$OS_AUTH_URL",
|
||||||
"region_name": "$REGION_NAME",
|
"region_name": "$REGION_NAME",
|
||||||
"admin": {
|
"admin": {
|
||||||
"username": "admin",
|
"username": "admin",
|
||||||
|
Loading…
Reference in New Issue
Block a user