From 133a94361af01cb1c6f36d6ba3d13ab60fc7dd2d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 15 Oct 2018 10:27:44 -0700
Subject: [PATCH] Cleanup Citycloud Lon1

This region does not show up in catalog listings anymore and is causing
inventory generation for ansible to fail. This change removes Lon1 from
the management side of things so that we can get ansible and puppet
running again.

This does not cleanup nodepool which we can do in a followup once
ansible and puppet are running again.

Change-Id: Icf3b19381ebba3498dfc204a48dc1ea52ae9d951
---
 playbooks/clouds_layouts.yml                  | 24 -------------------
 .../clouds/bridge_all_clouds.yaml.j2          |  2 --
 .../templates/clouds/bridge_clouds.yaml.j2    |  1 -
 3 files changed, 27 deletions(-)

diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml
index d464f437e0..e0298ab889 100644
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@@ -242,30 +242,6 @@ clouds:
       - openstackci-keypairs
 
   # Citycloud
-  - name: openstackci-citycloud-Lon1
-    oscc_cloud: openstackci-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-Lon1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: Lon1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
   - name: openstackci-citycloud-La1
     oscc_cloud: openstackci-citycloud
     region_name: La1
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 0109d04766..e716e7dc4e 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -120,7 +120,6 @@ clouds:
       user_domain_name: default
   openstackci-citycloud:
     regions:
-      - Lon1
       - Kna1
       - La1
       - Sto2
@@ -133,7 +132,6 @@ clouds:
       user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
   openstackzuul-citycloud:
     regions:
-      - Lon1
       - Kna1
       - La1
       - Sto2
diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2
index 52a9a71035..eca3a3295c 100644
--- a/playbooks/templates/clouds/bridge_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2
@@ -73,7 +73,6 @@ clouds:
       user_domain_name: default
   openstackci-citycloud:
     regions:
-      - Lon1
       - Kna1
       - La1
       - Sto2