From 36ca17c37bbc8deebff40d47ae60659e8774354f Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 12 Sep 2018 12:52:19 -0700
Subject: [PATCH] Force identity api version 3 against linaro london

Keystone auth and openstacksdk/openstackclient do not do the correct
thing without this setting set. They try v2 even though the discovery
doc at the root url does not list that version as valid. Force version 3
so that things will work again.

Change-Id: I7e1b0189c842bbf9640e2cd50873c9f7992dc8d3
---
 playbooks/templates/clouds/bridge_all_clouds.yaml.j2 | 1 +
 playbooks/templates/clouds/bridge_clouds.yaml.j2     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 0fd771263f..0109d04766 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -184,6 +184,7 @@ clouds:
       project_name: '{{ clouds.openstackzuul_linaro_london_project_name }}'
       project_domain_name: default
       user_domain_name: default
+    identity_api_version: 3
   openstackci-limestone:
     regions:
       - name: RegionOne
diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2
index 4e52c4487c..52a9a71035 100644
--- a/playbooks/templates/clouds/bridge_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2
@@ -104,6 +104,7 @@ clouds:
       project_name: '{{ clouds.openstackci_linaro_london_project_name }}'
       project_domain_name: default
       user_domain_name: default
+    identity_api_version: 3
   openstackci-limestone:
     regions:
       - name: RegionOne