From d83736575e5c6bc59b8cd3862666ebfb2894e013 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 6 Sep 2023 09:12:33 -0700 Subject: [PATCH] Remove fedora-35 and fedora-36 from nodepool providers This will stop providing the node label entirely and should result in nodepool cleaning up the existing images for these images in our cloud providers. It does not remove the diskimages for fedora which will happen next. Change-Id: Ic1361ff4e159509103a6436c88c9f3b5ca447777 --- nodepool/nl01.opendev.org.yaml | 18 ------------------ nodepool/nl02.opendev.org.yaml | 16 ---------------- nodepool/nl03.opendev.org.yaml | 20 -------------------- nodepool/nl04.opendev.org.yaml | 16 ---------------- nodepool/nodepool.yaml | 8 -------- 5 files changed, 78 deletions(-) diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 243647f356..2fcdf031c0 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -27,10 +27,6 @@ labels: min-ready: 1 - name: debian-buster min-ready: 1 - - name: fedora-35 - min-ready: 0 - - name: fedora-36 - min-ready: 0 - name: gentoo-17-0-systemd min-ready: 1 - name: opensuse-15 @@ -71,10 +67,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-35 - config-drive: true - - name: fedora-36 - config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-15 @@ -127,16 +119,6 @@ providers: flavor-name: 'Performance' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-35 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: fedora-35 - key-name: infra-root-keys-2020-05-13 - - name: fedora-36 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: fedora-36 - key-name: infra-root-keys-2020-05-13 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'Performance' diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index b5b46e37d2..b6ff80c7e0 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -21,8 +21,6 @@ labels: - name: debian-bookworm - name: debian-bullseye - name: debian-buster - - name: fedora-35 - - name: fedora-36 - name: gentoo-17-0-systemd - name: opensuse-15 - name: rockylinux-8 @@ -83,10 +81,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-35 - config-drive: true - - name: fedora-36 - config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-15 @@ -139,16 +133,6 @@ providers: flavor-name: 'opendev-zuul' diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-35 - min-ram: 8000 - flavor-name: 'opendev-zuul' - diskimage: fedora-35 - key-name: infra-root-keys-2020-05-13 - - name: fedora-36 - min-ram: 8000 - flavor-name: 'opendev-zuul' - diskimage: fedora-36 - key-name: infra-root-keys-2020-05-13 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: 'opendev-zuul' diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 5d119933f7..3c5f85cd09 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -25,8 +25,6 @@ labels: - name: debian-bookworm - name: debian-bullseye - name: debian-buster - - name: fedora-35 - - name: fedora-36 - name: gentoo-17-0-systemd - name: openEuler-22-03-LTS - name: opensuse-15 @@ -122,10 +120,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-35 - config-drive: true - - name: fedora-36 - config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-15 @@ -267,20 +261,6 @@ providers: volume-size: 80 diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-35 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: fedora-35 - key-name: infra-root-keys-2020-05-13 - - name: fedora-36 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: fedora-36 - key-name: infra-root-keys-2020-05-13 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: v2-highcpu-8 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index c73821ffb6..f5a444a4d6 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -21,8 +21,6 @@ labels: - name: debian-bookworm - name: debian-bullseye - name: debian-buster - - name: fedora-35 - - name: fedora-36 - name: gentoo-17-0-systemd - name: opensuse-15 - name: rockylinux-8 @@ -69,10 +67,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-35 - config-drive: true - - name: fedora-36 - config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-15 @@ -125,16 +119,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: debian-buster key-name: infra-root-keys-2020-05-13 - - name: fedora-35 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: fedora-35 - key-name: infra-root-keys-2020-05-13 - - name: fedora-36 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: fedora-36 - key-name: infra-root-keys-2020-05-13 - name: gentoo-17-0-systemd min-ram: 8000 flavor-name: ssd-osFoundation-3 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 0e4fd6c5da..72900f8bde 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -29,10 +29,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-35 - config-drive: true - - name: fedora-36 - config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-15 @@ -81,10 +77,6 @@ providers: config-drive: true - name: debian-buster config-drive: true - - name: fedora-35 - config-drive: true - - name: fedora-36 - config-drive: true - name: gentoo-17-0-systemd config-drive: true - name: opensuse-15