From cb4b99b3adc35963632748dc4f614df1dedbc663 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 3 Jun 2024 13:18:26 -0700
Subject: [PATCH] Clean up diskimages from inmotion cloud

Step two in removing the old inmotion cloud is deleting the old images
from the cloud so that Nodepool isn't trying to clean things up after
the cloud has gone away. This should hopefully avoid the need for manual
db cleanup.

Change-Id: Ia1451df866a7c91a652a4d9083e6c78cbfde678e
---
 nodepool/nl02.opendev.org.yaml | 85 +---------------------------------
 nodepool/nodepool.yaml         |  2 +-
 2 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml
index b025d50d16..c45b4b9690 100644
--- a/nodepool/nl02.opendev.org.yaml
+++ b/nodepool/nl02.opendev.org.yaml
@@ -38,92 +38,11 @@ providers:
     boot-timeout: 120
     launch-timeout: 300
     rate: 0.01
-    diskimages: &provider_diskimages
-      - name: centos-8-stream
-        config-drive: true
-      - name: centos-9-stream
-        config-drive: true
-      - name: debian-bookworm
-        config-drive: true
-      - name: debian-bullseye
-        config-drive: true
-      - name: gentoo-17-0-systemd
-        config-drive: true
-      - name: rockylinux-8
-        config-drive: true
-      - name: rockylinux-9
-        config-drive: true
-      - name: ubuntu-bionic
-        config-drive: true
-      - name: ubuntu-focal
-        config-drive: true
-      - name: ubuntu-jammy
-        config-drive: true
-      - name: ubuntu-noble
-        config-drive: true
-      - name: ubuntu-xenial
-        config-drive: true
-      - name: openEuler-22-03-LTS
-        config-drive: true
+    diskimages: []
     pools:
       - name: main
         max-servers: 0
-        labels:
-          - name: centos-8-stream
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: centos-8-stream
-            key-name: infra-root-keys-2024-04-08
-          - name: centos-9-stream
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: centos-9-stream
-            key-name: infra-root-keys-2024-04-08
-          - name: debian-bookworm
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: debian-bookworm
-            key-name: infra-root-keys-2024-04-08
-          - name: debian-bullseye
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: debian-bullseye
-            key-name: infra-root-keys-2024-04-08
-          - name: gentoo-17-0-systemd
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: gentoo-17-0-systemd
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-bionic
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: ubuntu-bionic
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-focal
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: ubuntu-focal
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-jammy
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: ubuntu-jammy
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-noble
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: ubuntu-noble
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-xenial
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: ubuntu-xenial
-            key-name: infra-root-keys-2024-04-08
-          - name: openEuler-22-03-LTS
-            min-ram: 8000
-            flavor-name: 'opendev-zuul'
-            diskimage: openEuler-22-03-LTS
-            key-name: infra-root-keys-2024-04-08
+        labels: []
 
 diskimages:
   - name: centos-8-stream
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 702e7b42de..d7fe841206 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -126,7 +126,7 @@ providers:
     rate: 0.25
     # 6 hours
     image-upload-timeout: 21600
-    diskimages: *provider_diskimages
+    diskimages: []
 
 diskimages:
   - name: base