Merge lp:~gnuoy/simplestreams/ksv3 into lp:simplestreams

[Liam Young]

Add support for the Keystone v3 API

simplestreams.openstack is hardcoded for Keystone API v2 client. This change
adds support for Keystone API v3. The version of the API requested is derived
from auth_url and if that fails it falls back to v2.

Closes-Bug: Bug #1624306

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:445
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~gnuoy/simplestreams/ksv3/+merge/305963/+edit-commit-message

https://jenkins.ubuntu.com/server/job/simplestreams-ci/35/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-amd64/35/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-arm64/35/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-ppc64el/35/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=metal-s390x/35/console
    FAILURE: https://jenkins.ubuntu.com/server/job/simplestreams-ci/nodes=vm-i386/35/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/simplestreams-ci/35/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

I believe this is fixed now, right?

I'm marking this 'merged' as revno 450, which added keyston v3 support.

if that is not sufficient, please reopen.

review: Needs Information

=== modified file 'simplestreams/openstack.py'
--- simplestreams/openstack.py	2014-12-12 16:36:00 +0000
+++ simplestreams/openstack.py	2016-09-16 14:15:10 +0000
@@ -16,12 +16,17 @@
 #   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
 
 from keystoneclient.v2_0 import client as ksclient
+from keystoneclient.v3 import client as ksclient_v3
+
 import os
 
 OS_ENV_VARS = (
     'OS_AUTH_TOKEN', 'OS_AUTH_URL', 'OS_CACERT', 'OS_IMAGE_API_VERSION',
     'OS_IMAGE_URL', 'OS_PASSWORD', 'OS_REGION_NAME', 'OS_STORAGE_URL',
-    'OS_TENANT_ID', 'OS_TENANT_NAME', 'OS_USERNAME', 'OS_INSECURE'
+    'OS_TENANT_ID', 'OS_TENANT_NAME', 'OS_USERNAME', 'OS_INSECURE',
+    'OS_USER_DOMAIN_NAME', 'OS_USER_DOMAIN_NAME', 'OS_PROJECT_DOMAIN_NAME',
+    'OS_USER_DOMAIN_ID', 'OS_PROJECT_DOMAIN_ID', 'OS_PROJECT_NAME',
+    'OS_PROJECT_ID'
 )
 
 
@@ -88,11 +93,30 @@
     return list(regions)
 
 
+def get_ks_api_version(auth_url):
+    version = None
+    if auth_url.endswith('/v3'):
+        version = 3
+    elif auth_url.endswith('/v2.0'):
+        version = 2
+    return version
+
+
 def get_ksclient(**kwargs):
-    pt = ('username', 'password', 'tenant_id', 'tenant_name', 'auth_url',
-          'cacert', 'insecure')
-    kskw = {k: kwargs.get(k) for k in pt if k in kwargs}
-    return ksclient.Client(**kskw)
+    api_version = get_ks_api_version(kwargs.get('auth_url', ''))
+    # If api version cannot be deduced fallback to v2
+    if api_version == 3:
+        pt = ('username', 'password', 'project_id', 'project_name', 'auth_url',
+              'cacert', 'insecure', 'user_domain_name', 'project_domain_name',
+              'user_domain_id', 'project_domain_id')
+        kskw = {k: kwargs.get(k) for k in pt if k in kwargs}
+        kc = ksclient_v3.Client(**kskw)
+    else:
+        pt = ('username', 'password', 'tenant_id', 'tenant_name', 'auth_url',
+              'cacert', 'insecure')
+        kskw = {k: kwargs.get(k) for k in pt if k in kwargs}
+        kc = ksclient.Client(**kskw)
+    return kc
 
 
 def get_service_conn_info(service='image', client=None, **kwargs):