From fcd02797eeb57ff981edaf77872033eee3c19d7f Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 20 Sep 2022 12:30:21 +0000 Subject: [PATCH] Add missing rockylinux and openeuler entries Our various nodepool launcher configs have gotten out of sync with recent additions. Try to match them up better by adding rockylinux and openeuler to places where they were missing. In particular, this addresses an inconsistency on nl04 which caused the service to crash at last restart due to rockylinux missing from the main diskimages list. Change-Id: Ie157ab7f667dbdc313b7fdbfc1df71874e8bd0fc --- nodepool/nl02.opendev.org.yaml | 14 ++++++++++++++ nodepool/nl03.opendev.org.yaml | 17 ++++++++++++++++- nodepool/nl04.opendev.org.yaml | 27 +++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index e4176fa567..9e21cf2131 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -31,6 +31,7 @@ labels: - name: ubuntu-focal - name: ubuntu-jammy - name: ubuntu-xenial + - name: openEuler-22-03-LTS - name: centos-7-expanded min-ready: 0 - name: ubuntu-bionic-expanded @@ -98,6 +99,8 @@ providers: config-drive: true - name: ubuntu-xenial config-drive: true + - name: openEuler-22-03-LTS + config-drive: true pools: - name: main max-servers: 0 @@ -182,6 +185,11 @@ providers: flavor-name: 'nodepool.0' diskimage: ubuntu-xenial key-name: infra-root-keys-2020-05-13 + - name: openEuler-22-03-LTS + min-ram: 8000 + flavor-name: 'nodepool.0' + diskimage: openEuler-22-03-LTS + key-name: infra-root-keys-2020-05-13 - name: nested-virt-ubuntu-bionic min-ram: 8000 flavor-name: 'nodepool.0' @@ -299,6 +307,11 @@ providers: flavor-name: 'opendev-zuul' diskimage: ubuntu-xenial key-name: infra-root-keys-2020-05-13 + - name: openEuler-22-03-LTS + min-ram: 8000 + flavor-name: 'opendev-zuul' + diskimage: openEuler-22-03-LTS + key-name: infra-root-keys-2020-05-13 diskimages: - name: centos-7 @@ -316,3 +329,4 @@ diskimages: - name: ubuntu-focal - name: ubuntu-jammy - name: ubuntu-xenial + - name: openEuler-22-03-LTS diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index 4bb8fbd951..ef5a0d40ce 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -40,6 +40,7 @@ labels: - name: ubuntu-focal - name: ubuntu-jammy - name: ubuntu-xenial + - name: openEuler-22-03-LTS - name: ubuntu-focal-arm64 min-ready: 0 - name: ubuntu-focal-arm64-xxxlarge @@ -121,6 +122,8 @@ providers: config-drive: true - name: ubuntu-xenial config-drive: true + - name: openEuler-22-03-LTS + config-drive: true pools: - name: main max-servers: 200 @@ -200,6 +203,11 @@ providers: flavor-name: 'A1.8' diskimage: ubuntu-xenial key-name: infra-root-keys-2020-05-13 + - name: openEuler-22-03-LTS + min-ram: 8000 + flavor-name: 'A1.8' + diskimage: openEuler-22-03-LTS + key-name: infra-root-keys-2020-05-13 - name: vexxhost-ca-ymq-1 region-name: 'ca-ymq-1' @@ -366,6 +374,13 @@ providers: volume-size: 80 diskimage: ubuntu-xenial key-name: infra-root-keys-2020-05-13 + - name: openEuler-22-03-LTS + min-ram: 8000 + flavor-name: v2-highcpu-8 + boot-from-volume: true + volume-size: 80 + diskimage: openEuler-22-03-LTS + key-name: infra-root-keys-2020-05-13 - name: nested-virt-ubuntu-bionic min-ram: 8000 flavor-name: v2-highcpu-8 @@ -588,5 +603,5 @@ diskimages: - name: ubuntu-jammy - name: ubuntu-jammy-arm64 - name: ubuntu-xenial + - name: openEuler-22-03-LTS - name: openEuler-22-03-LTS-arm64 - diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index 0ee952e240..aaa7e8594e 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -24,10 +24,13 @@ labels: - name: fedora-36 - name: gentoo-17-0-systemd - name: opensuse-15 + - name: rockylinux-8 + - name: rockylinux-9 - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-jammy - name: ubuntu-xenial + - name: openEuler-22-03-LTS - name: nested-virt-ubuntu-bionic min-ready: 0 - name: nested-virt-ubuntu-focal @@ -69,6 +72,10 @@ providers: config-drive: true - name: opensuse-15 config-drive: true + - name: rockylinux-8 + config-drive: true + - name: rockylinux-9 + config-drive: true - name: ubuntu-bionic config-drive: true - name: ubuntu-focal @@ -77,6 +84,8 @@ providers: config-drive: true - name: ubuntu-xenial config-drive: true + - name: openEuler-22-03-LTS + config-drive: true pools: - name: main max-servers: 120 @@ -126,6 +135,16 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: opensuse-15 key-name: infra-root-keys-2020-05-13 + - name: rockylinux-8 + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: rockylinux-8 + key-name: infra-root-keys-2020-05-13 + - name: rockylinux-9 + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: rockylinux-9 + key-name: infra-root-keys-2020-05-13 - name: ubuntu-bionic min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -146,6 +165,11 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: ubuntu-xenial key-name: infra-root-keys-2020-05-13 + - name: openEuler-22-03-LTS + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: openEuler-22-03-LTS + key-name: infra-root-keys-2020-05-13 - name: nested-virt-ubuntu-bionic min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -204,7 +228,10 @@ diskimages: - name: fedora-36 - name: gentoo-17-0-systemd - name: opensuse-15 + - name: rockylinux-8 + - name: rockylinux-9 - name: ubuntu-bionic - name: ubuntu-focal - name: ubuntu-jammy - name: ubuntu-xenial + - name: openEuler-22-03-LTS