From f824f3ee020068cb4b194023e82d230bf72731be Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 4 Apr 2019 13:43:35 +0000
Subject: [PATCH] Remove City Cloud LA1 region

City Cloud is taking their LA1 region offline permanently. We
disabled uploads to it some time back, so it can be cleanly removed
from our configuration at this point.

Change-Id: I18ec8bb71831b8401efc9c6568b129b9b40170a0
---
 nodepool/nl02.openstack.org.yaml | 17 -----------------
 nodepool/nodepool.yaml           |  6 ------
 2 files changed, 23 deletions(-)

diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index af08c9d517..ead0fbd4e6 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -120,23 +120,6 @@ providers:
             diskimage: ubuntu-xenial
             key-name: infra-root-keys-2018-06-15
 
-  - name: citycloud-la1
-    region-name: 'La1'
-    cloud: citycloud
-    boot-timeout: 120
-    launch-timeout: 600
-    clean-floating-ips: true
-    rate: 0.25
-    diskimages: *provider_diskimages
-    pools:
-      - name: main
-        # Disabled until 2018-07-01 at request of citycloud.
-        # We should contact them before reenabling at this date.
-        max-servers: 0
-        availability-zones:
-          - nova
-        labels: *provider_pools_labels
-
   - name: citycloud-lon1
     region-name: 'Lon1'
     cloud: citycloud
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index bd20c642db..426e9d4741 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -18,12 +18,6 @@ providers:
     # We should contact them before reenabling at this date.
     diskimages: []
 
-  - name: citycloud-la1
-    region-name: 'La1'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: []
-
   - name: citycloud-lon1
     region-name: 'Lon1'
     cloud: citycloud