From b5e72b4aa106774c93f730f92bf9985c0402f8e5 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 21 Dec 2022 10:17:55 +1100
Subject: [PATCH] Linaro: initial cloud config

This is just enough to get the cloud-launcher working on the new
Linaro cloud.  It's a bit of a manual setup, and much newer hardware,
so trying to do things in small steps.

Change-Id: Ibd451e80bbc6ba6526ba9470ac48b99a981c1a8d
---
 inventory/service/group_vars/bastion.yaml     | 17 +++++++++++++-
 .../clouds/bridge_all_clouds.yaml.j2          | 22 +++++++++++++++++++
 .../group_vars/control-plane-clouds.yaml.j2   |  6 +++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/inventory/service/group_vars/bastion.yaml b/inventory/service/group_vars/bastion.yaml
index 08a3e9d4cf..18b30df729 100644
--- a/inventory/service/group_vars/bastion.yaml
+++ b/inventory/service/group_vars/bastion.yaml
@@ -257,7 +257,7 @@ cloud_launcher_clouds:
     profiles:
       - openstackci-keypairs
 
-  # Linaro
+  # Linaro (old)
   - name: openstackci-linaro-us
     oscc_cloud: openstackci-linaro-us
     region_name: RegionOne
@@ -272,6 +272,21 @@ cloud_launcher_clouds:
       - openstackci-keypairs
       - openstackci-security
 
+  # Linaro (new)
+  - name: opendevci-linaro
+    oscc_cloud: opendevci-linaro
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
+  - name: opendevzuul-linaro
+    oscc_cloud: opendevzuul-linaro
+    region_name: RegionOne
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
+
   # Limestone
   - name: openstackci-limestone
     oscc_cloud: openstackci-limestone
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index cb33284936..100cd9180d 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -248,6 +248,28 @@ clouds:
       user_domain_name: default
       project_domain_name: default
     identity_api_version: '3'
+  opendevci-linaro:
+    regions:
+      - RegionOne
+    auth:
+      auth_url: https://openinfraci.linaro.cloud:5000
+      username: '{{ clouds.opendevci_linaro_username }}'
+      password: '{{ clouds.opendevci_linaro_password }}'
+      project_name: '{{ clouds.opendevci_linaro_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: 3
+  opendevzuul-linaro:
+    regions:
+      - RegionOne
+    auth:
+      auth_url: https://openinfraci.linaro.cloud:5000
+      username: '{{ clouds.opendevzuul_linaro_username }}'
+      password: '{{ clouds.opendevzuul_linaro_password }}'
+      project_name: '{{ clouds.opendevzuul_linaro_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
+    identity_api_version: 3
   opendevci-osuosl:
     regions:
       - RegionOne
diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
index e62fb5390a..bb629d8cfb 100644
--- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
@@ -56,6 +56,12 @@ clouds:
   opendevci_airship_password: password
   opendevzuul_airship_username: user
   opendevzuul_airship_password: password
+  opendevci_linaro_username: user
+  opendevci_linaro_password: password
+  opendevci_linaro_project_name: project
+  opendevzuul_linaro_username: user
+  opendevzuul_linaro_password: password
+  opendevzuul_linaro_project_name: project
   opendevci_osuosl_username: user
   opendevci_osuosl_password: password
   opendevci_osuosl_project_id: project