From af23479f15ab30a93894562a681e6e3da2ac3f5d Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 6 Feb 2018 15:17:11 +0000
Subject: [PATCH] Disable citycloud in nodepool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

At the request of Daniel Öhberg, CityNetwork VP of Operations, we
are ceasing booting CI nodes in any remaining regions and pausing
all image uploads for now. We should get back in touch with them
around the beginning of July to find out whether they're ready for
us to reenable use of this account.

Change-Id: I39f12d5a8441b197f5a310c7b33ba42c04c73378
---
 nodepool/nl02.openstack.org.yaml | 12 ++++--
 nodepool/nodepool.yaml           | 71 +++++++++++++++++++++-----------
 2 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml
index 2e543c878f..9050f710a1 100644
--- a/nodepool/nl02.openstack.org.yaml
+++ b/nodepool/nl02.openstack.org.yaml
@@ -53,7 +53,7 @@ providers:
         config-drive: true
     pools:
       - name: main
-        # Disabled until 2018-02-14 at request of citycloud.
+        # Disabled until 2018-07-01 at request of citycloud.
         # We should contact them before reenabling at this date.
         max-servers: 0
         availability-zones:
@@ -119,6 +119,8 @@ providers:
         config-drive: true
     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
@@ -183,9 +185,11 @@ providers:
         config-drive: true
     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
-        max-servers: 50
         labels:
           - name: centos-7
             min-ram: 8000
@@ -247,9 +251,11 @@ providers:
         config-drive: true
     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
-        max-servers: 50
         labels:
           - name: centos-7
             min-ram: 8000
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 4789fb841b..73a8532c8c 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -10,6 +10,53 @@ providers:
     region-name: 'Kna1'
     cloud: citycloud
     rate: 0.25
+    # Disabled until 2018-07-01 at request of citycloud.
+    # We should contact them before reenabling at this date.
+    diskimages: &paused_citycloud_diskimages
+      - name: centos-7
+        pause: true
+        config-drive: true
+      - name: debian-jessie
+        pause: true
+        config-drive: true
+      - name: fedora-26
+        pause: true
+        config-drive: true
+      - name: fedora-27
+        pause: true
+        config-drive: true
+      - name: opensuse-423
+        pause: true
+        config-drive: true
+      - name: ubuntu-trusty
+        pause: true
+        config-drive: true
+      - name: ubuntu-xenial
+        pause: true
+        config-drive: true
+
+  - name: citycloud-la1
+    region-name: 'La1'
+    cloud: citycloud
+    rate: 0.25
+    diskimages: *paused_citycloud_diskimages
+
+  - name: citycloud-lon1
+    region-name: 'Lon1'
+    cloud: citycloud
+    rate: 0.25
+    diskimages: *paused_citycloud_diskimages
+
+  - name: citycloud-sto2
+    region-name: 'Sto2'
+    cloud: citycloud
+    rate: 0.25
+    diskimages: *paused_citycloud_diskimages
+
+  - name: ovh-bhs1
+    region-name: 'BHS1'
+    cloud: ovh
+    rate: 0.1
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
@@ -26,30 +73,6 @@ providers:
       - name: ubuntu-xenial
         config-drive: true
 
-  - name: citycloud-la1
-    region-name: 'La1'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: *provider_diskimages
-
-  - name: citycloud-lon1
-    region-name: 'Lon1'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: *provider_diskimages
-
-  - name: citycloud-sto2
-    region-name: 'Sto2'
-    cloud: citycloud
-    rate: 0.25
-    diskimages: *provider_diskimages
-
-  - name: ovh-bhs1
-    region-name: 'BHS1'
-    cloud: ovh
-    rate: 0.1
-    diskimages: *provider_diskimages
-
   - name: ovh-gra1
     region-name: 'GRA1'
     cloud: ovh