From 0b8d14fefd94b3510dafdf57f9d117d0f1397351 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 4 Apr 2018 11:07:34 -0400 Subject: [PATCH] Remove fedora-26 nodes from nodepool We've had fedora-27 nodes online for a while now, plus we've recommend jobs be moved to fedora-27: http://lists.openstack.org/pipermail/openstack-dev/2018-March/127945.html We really only want to keep a single fedora node online, due to how long the support lifecyle is. Change-Id: Ie13e68eb3e7a266aa51d883b6d410832565e8f16 Signed-off-by: Paul Belanger --- nodepool/nl01.openstack.org.yaml | 9 --------- nodepool/nl02.openstack.org.yaml | 14 -------------- nodepool/nl03.openstack.org.yaml | 16 ---------------- nodepool/nl04.openstack.org.yaml | 9 --------- nodepool/nodepool.yaml | 21 --------------------- 5 files changed, 69 deletions(-) diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index 562d27cd6f..ea13446841 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -13,7 +13,6 @@ labels: min-ready: 1 - name: debian-jessie min-ready: 1 - - name: fedora-26 - name: fedora-27 min-ready: 1 - name: opensuse-423 @@ -39,8 +38,6 @@ providers: config-drive: true - name: debian-jessie config-drive: true - - name: fedora-26 - config-drive: true - name: fedora-27 config-drive: true - name: opensuse-423 @@ -67,11 +64,6 @@ providers: flavor-name: 'Performance' diskimage: debian-jessie key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: fedora-26 - key-name: infra-root-keys - name: fedora-27 min-ram: 8000 flavor-name: 'Performance' @@ -131,7 +123,6 @@ providers: diskimages: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: gentoo - name: opensuse-423 diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index e5b0193679..a27eb10ce9 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -11,7 +11,6 @@ zookeeper-servers: labels: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: opensuse-423 - name: opensuse-tumbleweed @@ -32,8 +31,6 @@ providers: config-drive: true - name: debian-jessie config-drive: true - - name: fedora-26 - config-drive: true - name: fedora-27 config-drive: true - name: opensuse-423 @@ -64,11 +61,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: debian-jessie key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: fedora-26 - key-name: infra-root-keys - name: fedora-27 min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -172,11 +164,6 @@ providers: flavor-name: 'nodepool.0' diskimage: debian-jessie key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: 'nodepool.0' - diskimage: fedora-26 - key-name: infra-root-keys - name: fedora-27 min-ram: 8000 flavor-name: 'nodepool.0' @@ -211,7 +198,6 @@ providers: diskimages: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: gentoo - name: opensuse-423 diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml index 2b43a1d4ea..d12bd5cb7d 100644 --- a/nodepool/nl03.openstack.org.yaml +++ b/nodepool/nl03.openstack.org.yaml @@ -14,7 +14,6 @@ zookeeper-servers: labels: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: opensuse-423 - name: opensuse-tumbleweed @@ -36,8 +35,6 @@ providers: config-drive: true - name: debian-jessie config-drive: true - - name: fedora-26 - config-drive: true - name: fedora-27 config-drive: true - name: opensuse-423 @@ -64,11 +61,6 @@ providers: flavor-name: 'A1.8' diskimage: debian-jessie key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: fedora-26 - key-name: infra-root-keys - name: fedora-27 min-ram: 8000 flavor-name: 'A1.8' @@ -124,13 +116,6 @@ providers: key-name: infra-root-keys boot-from-volume: True volume-size: 80 - - name: fedora-26 - min-ram: 8000 - flavor-name: 'v2-highcpu-8' - diskimage: fedora-26 - key-name: infra-root-keys - boot-from-volume: True - volume-size: 80 - name: fedora-27 min-ram: 8000 flavor-name: 'v2-highcpu-8' @@ -196,7 +181,6 @@ providers: diskimages: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: gentoo - name: opensuse-423 diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml index 2c0dccc9f0..849a156827 100644 --- a/nodepool/nl04.openstack.org.yaml +++ b/nodepool/nl04.openstack.org.yaml @@ -11,7 +11,6 @@ zookeeper-servers: labels: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: opensuse-423 - name: opensuse-tumbleweed @@ -31,8 +30,6 @@ providers: config-drive: true - name: debian-jessie config-drive: true - - name: fedora-26 - config-drive: true - name: fedora-27 config-drive: true - name: opensuse-423 @@ -59,11 +56,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: debian-jessie key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: fedora-26 - key-name: infra-root-keys - name: fedora-27 min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -110,7 +102,6 @@ providers: diskimages: - name: centos-7 - name: debian-jessie - - name: fedora-26 - name: fedora-27 - name: gentoo - name: opensuse-423 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index fa22ae70eb..a1a6b30f78 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -41,8 +41,6 @@ providers: config-drive: true - name: debian-jessie config-drive: true - - name: fedora-26 - config-drive: true - name: fedora-27 config-drive: true - name: gentoo-17-0-systemd @@ -140,25 +138,6 @@ diskimages: DIB_DISABLE_APT_CLEANUP: '1' DIB_DISTRIBUTION_MIRROR: http://ftp.us.debian.org/debian/ DIB_GRUB_TIMEOUT: '0' - - name: fedora-26 - pause: false - elements: - - fedora-minimal - - vm - - simple-init - - openstack-repos - - nodepool-base - - cache-devstack - - initialize-urandom - - growroot - - infra-package-needs - release: 26 - env-vars: - TMPDIR: /opt/dib_tmp - DIB_CHECKSUM: '1' - DIB_IMAGE_CACHE: /opt/dib_cache - QEMU_IMG_OPTIONS: compat=0.10 - DIB_GRUB_TIMEOUT: '0' - name: fedora-27 pause: false elements: