Merge ~juliank/autopkgtest/+git/development:master into ~ubuntu-release/autopkgtest/+git/development:master

[Julian Andres Klode]

Foo

Bar

diff --git a/ssh-setup/nova b/ssh-setup/nova
index 5336252..ae8767c 100755
--- a/ssh-setup/nova
+++ b/ssh-setup/nova
@@ -185,9 +185,29 @@ open() {
     last=$(cat <<EOF | python3
 import os, re
 import novaclient.client
-nova = novaclient.client.Client('2', os.environ['NOVA_USERNAME'], os.environ['NOVA_PASSWORD'],
-                                os.environ['NOVA_PROJECT_ID'], auth_url=os.environ['OS_AUTH_URL'],
-                                region_name=os.environ['NOVA_REGION'])
+from keystoneauth1.identity import v2, v3
+from keystoneauth1 import session
+
+if os.environ.get('OS_IDENTITY_API_VERSION') == '3':
+    auth = v3.Password(auth_url=os.environ['OS_AUTH_URL'],
+                       username=os.environ['OS_USERNAME'],
+                       password=os.environ['OS_PASSWORD'],
+                       project_name=os.environ['OS_PROJECT_NAME'],
+                       user_domain_name=os.environ['OS_USER_DOMAIN_NAME'],
+                       project_domain_name=os.environ['OS_PROJECT_DOMAIN_NAME'])
+else:
+    auth = v2.Password(
+            auth_url=os.environ['OS_AUTH_URL'],
+            username=os.environ['OS_USERNAME'],
+            password=os.environ['OS_PASSWORD'],
+            tenant_name=os.environ['OS_TENANT_NAME'])
+
+sess = session.Session(auth=auth)
+
+
+nova = novaclient.client.Client('2', session=sess,
+                                region_name=os.environ["OS_REGION_NAME"])
+
 latest = None
 for i in nova.images.list():
     if i.status == 'ACTIVE' and re.match('${IMAGE}', i.name):