From da6d1cbd067b946c337b51e07922f239fe199a81 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 15 May 2020 12:22:31 +1000
Subject: [PATCH] Remove linaro-london cloud

This cloud is no longer used

Change-Id: I14ab277b3877f6674ec3172c06a39f383e76a1d0
Depends-On: https://review.opendev.org/728332
---
 hiera/common.yaml                             |  1 -
 inventory/openstack.yaml                      |  7 ------
 playbooks/host_vars/bridge.openstack.org.yaml | 23 -------------------
 .../test-fixtures/results.yaml                |  8 ++++++-
 .../clouds/bridge_all_clouds.yaml.j2          | 21 -----------------
 .../templates/clouds/nodepool_clouds.yaml.j2  | 11 ---------
 6 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 54922c8da6..9ade6e4645 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -282,7 +282,6 @@ cacti_hosts:
 - mirror.mtl01.inap.opendev.org
 - mirror02.us-west-1.packethost.openstack.org
 - mirror01.regionone.linaro-us.opendev.org
-- mirror01.regionone.linaro-london.openstack.org
 - mirror-update.openstack.org
 - review-dev01.opendev.org
 - review.openstack.org
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index b8963df09e..cf37f918bd 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -459,13 +459,6 @@ all:
         region_name: IAD
       public_v4: 104.130.4.72
       public_v6: 2001:4802:7802:104:be76:4eff:fe20:145a
-    mirror01.london.linaro-london.openstack.org:
-      ansible_host: 213.146.141.37
-      location:
-        cloud: openstackci-linaro-london
-        region_name: London
-      public_v4: 213.146.141.37
-      public_v6: ''
     mirror01.regionone.linaro-us.opendev.org:
       ansible_host: 2604:1380:4111:3e54:f816:3eff:fea4:899d
       location:
diff --git a/playbooks/host_vars/bridge.openstack.org.yaml b/playbooks/host_vars/bridge.openstack.org.yaml
index 907d24fc3c..606a518d98 100644
--- a/playbooks/host_vars/bridge.openstack.org.yaml
+++ b/playbooks/host_vars/bridge.openstack.org.yaml
@@ -256,29 +256,6 @@ cloud_launcher_clouds:
       - openstackci-keypairs
 
   # Linaro
-  - name: openstackci-linaro-london
-    oscc_cloud: openstackci-linaro-london
-    region_name: London
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-    images:
-      - name: ubuntu-xenial
-        download_image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-arm64-uefi1.img
-        download_image_dest: /tmp/ubuntu-xenial-aarch64-uefi.img
-        filename: /tmp/ubuntu-xenial-aarch64-uefi.img
-        properties:
-          hw_firmware_type: uefi
-          os_command_line: console=ttyAMA0
-          hw_disk_bus: scsi
-          hw_scsi_model: virtio-scsi
-  - name: openstackzuul-linaro-london
-    oscc_cloud: openstackzuul-linaro-london
-    region_name: London
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
   - name: openstackci-linaro-us
     oscc_cloud: openstackci-linaro-us
     region_name: RegionOne
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index 4e79bb7136..975b81d478 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -33,10 +33,16 @@ results:
     - puppet
     - puppet4
 
-  mirror01.lon1.linaro-london.openstack.org:
+  mirror02.dfw.rax.openstack.org:
     - afs-client
     - mirror
     - puppet
+    - puppet4
+
+  mirror01.regionone.linaro-us.opendev.org:
+    - afs-client
+    - letsencrypt
+    - mirror_opendev
 
   mirror-update01.openstack.org:
     - afsadmin
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 9c543aaa56..3a2b3f6d89 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -129,27 +129,6 @@ clouds:
       project_name: '{{ clouds.openstackci_vexxhost_project_name }}'
       project_domain_name: default
       user_domain_name: default
-  openstackci-linaro-london:
-    regions:
-      - London
-    auth:
-      auth_url: https://uk.linaro.cloud:5000
-      username: '{{ clouds.openstackci_linaro_london_username }}'
-      password: '{{ clouds.openstackci_linaro_london_password }}'
-      project_name: '{{ clouds.openstackci_linaro_london_project_name }}'
-      project_domain_name: default
-      user_domain_name: default
-  openstackzuul-linaro-london:
-    regions:
-      - London
-    auth:
-      auth_url: https://uk.linaro.cloud:5000
-      username: '{{ clouds.openstackzuul_linaro_london_username }}'
-      password: '{{ clouds.openstackzuul_linaro_london_password }}'
-      project_name: '{{ clouds.openstackzuul_linaro_london_project_name }}'
-      project_domain_name: default
-      user_domain_name: default
-    identity_api_version: 3
   openstackci-linaro-us:
     regions:
       - RegionOne
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 0b7bfe6a91..f3c970e8a4 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -78,17 +78,6 @@ clouds:
       user_domain_name: default
     image_format: 'raw'
     force_ipv4: true
-  linaro-london:
-    regions:
-      - London
-    identity_api_version: '3'
-    auth:
-      auth_url: https://uk.linaro.cloud:5000
-      username: '{{ nodepool_linaro_london_username }}'
-      password: '{{ nodepool_linaro_london_password }}'
-      project_name: '{{ nodepool_linaro_london_project }}'
-      project_domain_name: default
-      user_domain_name: default
   linaro-us:
     regions:
       - name: RegionOne