From 3b5673ce4c8c9d54568028056300eae053828ee0 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 5 Jan 2016 10:30:28 -0600 Subject: [PATCH] Update auth urls and identity API versions Most of the clouds, it turns out, support unversioned auth_url as well as keystone v3. Change-Id: I088d008cd2732f137c8a1bbbd9c0a43f7d382f92 --- doc/source/vendor-support.rst | 4 ++-- os_client_config/vendors/auro.json | 1 + os_client_config/vendors/conoha.json | 5 +++-- os_client_config/vendors/datacentred.json | 3 ++- os_client_config/vendors/dreamhost.json | 3 ++- os_client_config/vendors/elastx.json | 3 ++- os_client_config/vendors/entercloudsuite.json | 3 ++- os_client_config/vendors/hp.json | 3 ++- os_client_config/vendors/internap.json | 3 ++- os_client_config/vendors/ovh.json | 3 ++- os_client_config/vendors/runabove.json | 3 ++- os_client_config/vendors/ultimum.json | 3 ++- 12 files changed, 24 insertions(+), 13 deletions(-) diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst index 8ae2f61..a215822 100644 --- a/doc/source/vendor-support.rst +++ b/doc/source/vendor-support.rst @@ -74,7 +74,7 @@ Kna1 Karlskrona, SE conoha ------ -https://identity.%(region_name)s.conoha.io/v2.0 +https://identity.%(region_name)s.conoha.io ============== ================ Region Name Human Name @@ -89,7 +89,7 @@ sjc1 San Jose, CA datacentred ----------- -https://compute.datacentred.io:5000/v2.0 +https://compute.datacentred.io:5000 ============== ================ Region Name Human Name diff --git a/os_client_config/vendors/auro.json b/os_client_config/vendors/auro.json index 1e59f01..a9e709b 100644 --- a/os_client_config/vendors/auro.json +++ b/os_client_config/vendors/auro.json @@ -4,6 +4,7 @@ "auth": { "auth_url": "https://api.van1.auro.io:5000/v2.0" }, + "identity_api_version": "2", "region_name": "van1" } } diff --git a/os_client_config/vendors/conoha.json b/os_client_config/vendors/conoha.json index 8e33ca4..5636f09 100644 --- a/os_client_config/vendors/conoha.json +++ b/os_client_config/vendors/conoha.json @@ -2,12 +2,13 @@ "name": "conoha", "profile": { "auth": { - "auth_url": "https://identity.{region_name}.conoha.io/v2.0" + "auth_url": "https://identity.{region_name}.conoha.io" }, "regions": [ "sin1", "sjc1", "tyo1" - ] + ], + "identity_api_version": "2" } } diff --git a/os_client_config/vendors/datacentred.json b/os_client_config/vendors/datacentred.json index 1fb4dbb..2be4a58 100644 --- a/os_client_config/vendors/datacentred.json +++ b/os_client_config/vendors/datacentred.json @@ -2,9 +2,10 @@ "name": "datacentred", "profile": { "auth": { - "auth_url": "https://compute.datacentred.io:5000/v2.0" + "auth_url": "https://compute.datacentred.io:5000" }, "region-name": "sal01", + "identity_api_version": "2", "image_api_version": "1" } } diff --git a/os_client_config/vendors/dreamhost.json b/os_client_config/vendors/dreamhost.json index 8580826..6fc2ccf 100644 --- a/os_client_config/vendors/dreamhost.json +++ b/os_client_config/vendors/dreamhost.json @@ -2,8 +2,9 @@ "name": "dreamhost", "profile": { "auth": { - "auth_url": "https://keystone.dream.io/v2.0" + "auth_url": "https://keystone.dream.io" }, + "identity_api_version": "3", "region_name": "RegionOne", "image_format": "raw" } diff --git a/os_client_config/vendors/elastx.json b/os_client_config/vendors/elastx.json index cac755e..1e72482 100644 --- a/os_client_config/vendors/elastx.json +++ b/os_client_config/vendors/elastx.json @@ -2,8 +2,9 @@ "name": "elastx", "profile": { "auth": { - "auth_url": "https://ops.elastx.net:5000/v2.0" + "auth_url": "https://ops.elastx.net:5000" }, + "identity_api_version": "3", "region_name": "regionOne" } } diff --git a/os_client_config/vendors/entercloudsuite.json b/os_client_config/vendors/entercloudsuite.json index 5a425b4..6d2fc12 100644 --- a/os_client_config/vendors/entercloudsuite.json +++ b/os_client_config/vendors/entercloudsuite.json @@ -2,8 +2,9 @@ "name": "entercloudsuite", "profile": { "auth": { - "auth_url": "https://api.entercloudsuite.com/v2.0" + "auth_url": "https://api.entercloudsuite.com/" }, + "identity_api_version": "3", "volume_api_version": "1", "regions": [ "it-mil1", diff --git a/os_client_config/vendors/hp.json b/os_client_config/vendors/hp.json index ac280f2..b06b90a 100644 --- a/os_client_config/vendors/hp.json +++ b/os_client_config/vendors/hp.json @@ -2,12 +2,13 @@ "name": "hp", "profile": { "auth": { - "auth_url": "https://region-b.geo-1.identity.hpcloudsvc.com:35357/v2.0" + "auth_url": "https://region-b.geo-1.identity.hpcloudsvc.com:35357" }, "regions": [ "region-a.geo-1", "region-b.geo-1" ], + "identity_api_version": "3", "dns_service_type": "hpext:dns", "volume_api_version": "1", "image_api_version": "1" diff --git a/os_client_config/vendors/internap.json b/os_client_config/vendors/internap.json index 9b27536..d5ad49f 100644 --- a/os_client_config/vendors/internap.json +++ b/os_client_config/vendors/internap.json @@ -2,13 +2,14 @@ "name": "internap", "profile": { "auth": { - "auth_url": "https://identity.api.cloud.iweb.com/v2.0" + "auth_url": "https://identity.api.cloud.iweb.com" }, "regions": [ "ams01", "da01", "nyj01" ], + "identity_api_version": "3", "image_api_version": "1", "floating_ip_source": "None" } diff --git a/os_client_config/vendors/ovh.json b/os_client_config/vendors/ovh.json index 032741f..664f161 100644 --- a/os_client_config/vendors/ovh.json +++ b/os_client_config/vendors/ovh.json @@ -2,13 +2,14 @@ "name": "ovh", "profile": { "auth": { - "auth_url": "https://auth.cloud.ovh.net/v2.0" + "auth_url": "https://auth.cloud.ovh.net/" }, "regions": [ "BHS1", "GRA1", "SBG1" ], + "identity_api_version": "3", "image_format": "raw", "floating_ip_source": "None" } diff --git a/os_client_config/vendors/runabove.json b/os_client_config/vendors/runabove.json index 56dd945..abf1116 100644 --- a/os_client_config/vendors/runabove.json +++ b/os_client_config/vendors/runabove.json @@ -2,12 +2,13 @@ "name": "runabove", "profile": { "auth": { - "auth_url": "https://auth.runabove.io/v2.0" + "auth_url": "https://auth.runabove.io/" }, "regions": [ "BHS-1", "SBG-1" ], + "identity_api_version": "3", "image_format": "qcow2", "floating_ip_source": "None" } diff --git a/os_client_config/vendors/ultimum.json b/os_client_config/vendors/ultimum.json index 0b38d71..4bfd088 100644 --- a/os_client_config/vendors/ultimum.json +++ b/os_client_config/vendors/ultimum.json @@ -2,8 +2,9 @@ "name": "ultimum", "profile": { "auth": { - "auth_url": "https://console.ultimum-cloud.com:5000/v2.0" + "auth_url": "https://console.ultimum-cloud.com:5000/" }, + "identity_api_version": "3", "volume_api_version": "1", "region-name": "RegionOne" }