From aabaf95b494e8aaed0d88b6b0fe458cea731213d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 13 Mar 2024 08:30:16 -0700
Subject: [PATCH] Remove centos-7 nodepool image builds

This is the last step in cleaning centos-7 out of nodepool. The previous
change will have cleaned up uploads and now we can stop building the
images entirely.

Change-Id: Ie81d6d516cd6cd42ae9797025a39521ceede7b71
---
 nodepool/nb04.opendev.org.yaml |  3 ---
 nodepool/nl01.opendev.org.yaml |  1 -
 nodepool/nl02.opendev.org.yaml |  1 -
 nodepool/nl03.opendev.org.yaml |  1 -
 nodepool/nl04.opendev.org.yaml |  1 -
 nodepool/nodepool.yaml         | 10 ----------
 6 files changed, 17 deletions(-)

diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml
index e2a26f07ac..7443c5904a 100644
--- a/nodepool/nb04.opendev.org.yaml
+++ b/nodepool/nb04.opendev.org.yaml
@@ -137,9 +137,6 @@ diskimages:
 
 ############ CentOS and Fedora (and derivatives) #############
 
-  - name: centos-7
-    elements: []
-
   - name: centos-8-stream
     elements: []
 
diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml
index 772d9192a3..1302be448b 100644
--- a/nodepool/nl01.opendev.org.yaml
+++ b/nodepool/nl01.opendev.org.yaml
@@ -170,7 +170,6 @@ providers:
         labels: *provider_pools_labels
 
 diskimages:
-  - name: centos-7
   - name: centos-8-stream
   - name: centos-9-stream
   - name: debian-bookworm
diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml
index 8ba24aa237..a623fc20e0 100644
--- a/nodepool/nl02.opendev.org.yaml
+++ b/nodepool/nl02.opendev.org.yaml
@@ -140,7 +140,6 @@ providers:
             key-name: infra-root-keys-2020-05-13
 
 diskimages:
-  - name: centos-7
   - name: centos-8-stream
   - name: centos-9-stream
   - name: debian-bookworm
diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml
index 3668f8a330..c784c97580 100644
--- a/nodepool/nl03.opendev.org.yaml
+++ b/nodepool/nl03.opendev.org.yaml
@@ -474,7 +474,6 @@ providers:
             key-name: infra-root-keys-2020-05-13
 
 diskimages:
-  - name: centos-7
   - name: centos-8-stream
   - name: centos-9-stream
   - name: centos-8-stream-arm64
diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml
index a86c34518a..07468e85b1 100644
--- a/nodepool/nl04.opendev.org.yaml
+++ b/nodepool/nl04.opendev.org.yaml
@@ -194,7 +194,6 @@ providers:
         labels: *provider_pools_labels
 
 diskimages:
-  - name: centos-7
   - name: centos-8-stream
   - name: centos-9-stream
   - name: debian-bookworm
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 2b7b762a76..ccb0ad21f5 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -158,16 +158,6 @@ diskimages:
 
 ############ CentOS and Fedora (and derivatives) #############
 
-  - name: centos-7
-    parent: base
-    pause: false
-    elements:
-      - centos-minimal
-      - epel
-      - cache-devstack
-    env-vars:
-      DIB_EPEL_DISABLED: '1'
-
   - name: centos-8-stream
     parent: base
     pause: false