diff --git a/nodepool/nb04.opendev.org.yaml b/nodepool/nb04.opendev.org.yaml index 30c11af8ad..9d3936d647 100644 --- a/nodepool/nb04.opendev.org.yaml +++ b/nodepool/nb04.opendev.org.yaml @@ -67,14 +67,6 @@ providers: os_command_line: "console=ttyAMA0" hw_disk_bus: scsi hw_scsi_model: virtio-scsi - - name: centos-8-stream-arm64 - pause: false - config-drive: true - meta: - hw_firmware_type: uefi - os_command_line: "console=ttyAMA0" - hw_disk_bus: scsi - hw_scsi_model: virtio-scsi - name: centos-9-stream-arm64 pause: false config-drive: true diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index 88bd791609..9f0586a92d 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -15,8 +15,6 @@ zookeeper-servers: # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, # another launcher will need to assume this logic. labels: - - name: centos-8-stream - min-ready: 0 - name: centos-9-stream min-ready: 1 - name: debian-bookworm @@ -53,8 +51,6 @@ providers: launch-timeout: 600 rate: 0.001 diskimages: &provider_diskimages - - name: centos-8-stream - config-drive: true - name: centos-9-stream config-drive: true - name: debian-bookworm @@ -83,11 +79,6 @@ providers: - name: main max-servers: 140 labels: &provider_pools_labels - - name: centos-8-stream - min-ram: 8192 - flavor-name: 'Performance' - diskimage: centos-8-stream - key-name: infra-root-keys-2024-04-08 - name: centos-9-stream min-ram: 8192 flavor-name: 'Performance' diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 35d0d35dc9..6861e2f163 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -19,7 +19,6 @@ zookeeper-servers: # e.g. *-arm64 labels: # x86_64 - - name: centos-8-stream - name: centos-9-stream - name: debian-bookworm - name: debian-bullseye @@ -34,8 +33,6 @@ labels: - name: ubuntu-noble # arm64 - - name: centos-8-stream-arm64 - min-ready: 0 - name: centos-9-stream-arm64 min-ready: 0 - name: rockylinux-9-arm64 @@ -96,8 +93,6 @@ labels: min-ready: 0 - name: nested-virt-ubuntu-noble min-ready: 0 - - name: nested-virt-centos-8-stream - min-ready: 0 - name: nested-virt-centos-9-stream min-ready: 0 - name: nested-virt-rockylinux-9 @@ -112,8 +107,6 @@ providers: boot-timeout: 120 rate: 0.001 diskimages: &provider_diskimages - - name: centos-8-stream - config-drive: true - name: centos-9-stream config-drive: true - name: debian-bookworm @@ -225,13 +218,6 @@ providers: - name: main max-servers: 0 labels: - - name: centos-8-stream - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: centos-8-stream - key-name: infra-root-keys-2024-04-08 - name: centos-9-stream min-ram: 8000 flavor-name: v2-highcpu-8 @@ -344,13 +330,6 @@ providers: volume-size: 80 diskimage: ubuntu-noble key-name: infra-root-keys-2024-04-08 - - name: nested-virt-centos-8-stream - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: centos-8-stream - key-name: infra-root-keys-2024-04-08 - name: nested-virt-centos-9-stream min-ram: 8000 flavor-name: v2-highcpu-8 @@ -377,8 +356,6 @@ providers: diskimages: - name: centos-9-stream-arm64 config-drive: true - - name: centos-8-stream-arm64 - config-drive: true - name: debian-bookworm-arm64 config-drive: true - name: debian-bullseye-arm64 @@ -401,10 +378,6 @@ providers: flavor-name: 'opendev.large' diskimage: centos-9-stream-arm64 key-name: infra-root-keys-2024-04-08 - - name: centos-8-stream-arm64 - flavor-name: 'opendev.large' - diskimage: centos-8-stream-arm64 - key-name: infra-root-keys-2024-04-08 - name: debian-bookworm-arm64 flavor-name: 'opendev.large' diskimage: debian-bookworm-arm64 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index c0410ceed0..2543fc0814 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -15,7 +15,6 @@ zookeeper-servers: # nl01.o.o will manage min-ready of our labels. If nl01.o.o is ever disabled, # another launcher will need to assume this logic. labels: - - name: centos-8-stream - name: centos-9-stream - name: debian-bookworm - name: debian-bullseye @@ -40,8 +39,6 @@ labels: min-ready: 0 - name: nested-virt-ubuntu-noble min-ready: 0 - - name: nested-virt-centos-8-stream - min-ready: 0 - name: nested-virt-centos-9-stream min-ready: 0 - name: nested-virt-rockylinux-9 @@ -57,8 +54,6 @@ providers: launch-timeout: 600 rate: 0.1 diskimages: &provider_diskimages - - name: centos-8-stream - config-drive: true - name: centos-9-stream config-drive: true - name: debian-bookworm @@ -87,11 +82,6 @@ providers: - name: main max-servers: 120 labels: &provider_pools_labels - - name: centos-8-stream - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: centos-8-stream - key-name: infra-root-keys-2024-04-08 - name: centos-9-stream min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -182,11 +172,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: ubuntu-noble key-name: infra-root-keys-2024-04-08 - - name: nested-virt-centos-8-stream - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: centos-8-stream - key-name: infra-root-keys-2024-04-08 - name: nested-virt-centos-9-stream min-ram: 8000 flavor-name: ssd-osFoundation-3 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 86362e9008..61da8b41c9 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -19,8 +19,6 @@ providers: # 6 hours image-upload-timeout: 21600 diskimages: &provider_diskimages - - name: centos-8-stream - config-drive: true - name: centos-9-stream config-drive: true - name: debian-bookworm