From a45278dbb037a236435c95e210f7c9949bfba427 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 27 Jan 2020 11:33:57 -0800
Subject: [PATCH] Set rax api versions for volume and identity

Rax APIs don't support newer identity v3 or volume v2/v3. Set identity
to v2 so that catalogs can be listed and volume to v1 so that volumes
can be listed.

Change-Id: I6dddf93fb2c7b1a73315629e4a983a2d5a0142cc
---
 playbooks/templates/clouds/bridge_all_clouds.yaml.j2       | 4 ++++
 playbooks/templates/clouds/bridge_clouds.yaml.j2           | 2 ++
 playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 | 4 ++++
 playbooks/templates/clouds/nodepool_clouds.yaml.j2         | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 3aa49f8271..e994a188d9 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -73,6 +73,8 @@ clouds:
       username: '{{ clouds.openstackci_rax_username }}'
       password: '{{ clouds.openstackci_rax_password }}'
       project_id: '{{ clouds.openstackci_rax_project_id }}'
+    identity_api_version: 2
+    volume_api_version: 1
   openstackjenkins-rax:
     regions:
       - DFW
@@ -83,6 +85,8 @@ clouds:
       username: '{{ clouds.openstackjenkins_rax_username }}'
       password: '{{ clouds.openstackjenkins_rax_password }}'
       project_id: '{{ clouds.openstackjenkins_rax_project_id }}'
+    identity_api_version: 2
+    volume_api_version: 1
   openstackjenkins-ovh:
     regions:
       - GRA1
diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2
index c16c5b35d9..d4a1d90586 100644
--- a/playbooks/templates/clouds/bridge_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2
@@ -60,6 +60,8 @@ clouds:
       username: '{{ clouds.openstackci_rax_username }}'
       password: '{{ clouds.openstackci_rax_password }}'
       project_id: '{{ clouds.openstackci_rax_project_id }}'
+    identity_api_version: 2
+    volume_api_version: 1
   openstackci-vexxhost:
     regions:
       - ca-ymq-1
diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2
index 2e16338fb6..911a237ff8 100644
--- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2
@@ -28,6 +28,8 @@ clouds:
       password: '{{ nodepool_rackspace_password }}'
       project_id: '{{ nodepool_rackspace_project }}'
     force_ipv4: true
+    identity_api_version: 2
+    volume_api_version: 1
   rax-control-plane:
     regions:
       - DFW
@@ -39,6 +41,8 @@ clouds:
       password: '{{ clouds.openstackci_rax_password }}'
       project_id: '{{ clouds.openstackci_rax_project_id }}'
     force_ipv4: true
+    identity_api_version: 2
+    volume_api_version: 1
   ovh:
     profile: ovh
     # OVH has a weird new ipv6 setup that we can't handle properly
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index b34fa9c6a4..06f075978b 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -29,6 +29,8 @@ clouds:
       password: '{{ nodepool_rackspace_password }}'
       project_id: '{{ nodepool_rackspace_project }}'
     force_ipv4: true
+    identity_api_version: 2
+    volume_api_version: 1
   ovh:
     profile: ovh
     # OVH has a weird new ipv6 setup that we can't handle properly