diff --git a/nodepool/nl01.opendev.org.yaml b/nodepool/nl01.opendev.org.yaml index d5dec630ce..7a2e92d0e3 100644 --- a/nodepool/nl01.opendev.org.yaml +++ b/nodepool/nl01.opendev.org.yaml @@ -21,6 +21,8 @@ labels: min-ready: 1 - name: centos-8-stream min-ready: 1 + - name: centos-9-stream + min-ready: 1 - name: debian-bullseye min-ready: 1 - name: debian-buster @@ -57,6 +59,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: centos-9-stream + config-drive: true - name: debian-bullseye config-drive: true - name: debian-buster @@ -96,6 +100,11 @@ providers: flavor-name: 'Performance' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8192 + flavor-name: 'Performance' + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: 'Performance' @@ -175,6 +184,7 @@ diskimages: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: centos-9-stream - name: debian-bullseye - name: debian-buster - name: debian-stretch diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml index 225e54dd6b..109afeaea0 100644 --- a/nodepool/nl02.opendev.org.yaml +++ b/nodepool/nl02.opendev.org.yaml @@ -18,6 +18,7 @@ labels: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: centos-9-stream - name: debian-bullseye - name: debian-buster - name: debian-stretch @@ -68,6 +69,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: centos-9-stream + config-drive: true - name: debian-bullseye config-drive: true - name: debian-buster @@ -107,6 +110,11 @@ providers: flavor-name: 'nodepool.0' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8000 + flavor-name: 'nodepool.0' + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: 'nodepool.0' @@ -216,6 +224,11 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8000 + flavor-name: '8C-8GB-100GB' + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -310,6 +323,11 @@ providers: flavor-name: 'opendev-zuul' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8000 + flavor-name: 'opendev-zuul' + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: 'opendev-zuul' @@ -370,6 +388,7 @@ diskimages: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: centos-9-stream - name: debian-bullseye - name: debian-buster - name: debian-stretch diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml index db26a185f6..79672bbb12 100644 --- a/nodepool/nl03.opendev.org.yaml +++ b/nodepool/nl03.opendev.org.yaml @@ -25,6 +25,7 @@ labels: - name: centos-8-arm64-large min-ready: 0 - name: centos-8-stream + - name: centos-9-stream - name: centos-8-stream-arm64 min-ready: 0 - name: debian-bullseye @@ -90,6 +91,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: centos-9-stream + config-drive: true - name: debian-bullseye config-drive: true - name: debian-buster @@ -129,6 +132,11 @@ providers: flavor-name: 'A1.8' diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8000 + flavor-name: 'A1.8' + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: 'A1.8' @@ -270,6 +278,13 @@ providers: volume-size: 80 diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8000 + flavor-name: v2-highcpu-8 + boot-from-volume: true + volume-size: 80 + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: v2-highcpu-8 @@ -523,6 +538,7 @@ diskimages: - name: centos-8 - name: centos-8-arm64 - name: centos-8-stream + - name: centos-9-stream - name: centos-8-stream-arm64 - name: debian-bullseye - name: debian-bullseye-arm64 diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml index faf742583f..907dd5df66 100644 --- a/nodepool/nl04.opendev.org.yaml +++ b/nodepool/nl04.opendev.org.yaml @@ -18,6 +18,7 @@ labels: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: centos-9-stream - name: debian-bullseye - name: debian-buster - name: debian-stretch @@ -53,6 +54,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: centos-9-stream + config-drive: true - name: debian-bullseye config-drive: true - name: debian-buster @@ -92,6 +95,11 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: centos-8-stream key-name: infra-root-keys-2020-05-13 + - name: centos-9-stream + min-ram: 8000 + flavor-name: ssd-osFoundation-3 + diskimage: centos-9-stream + key-name: infra-root-keys-2020-05-13 - name: debian-bullseye min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -184,6 +192,7 @@ diskimages: - name: centos-7 - name: centos-8 - name: centos-8-stream + - name: centos-9-stream - name: debian-bullseye - name: debian-buster - name: debian-stretch diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index a378283e24..25d3fe6fc5 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -23,6 +23,8 @@ providers: config-drive: true - name: centos-8-stream config-drive: true + - name: centos-9-stream + config-drive: true - name: debian-bullseye config-drive: true - name: debian-buster @@ -171,6 +173,17 @@ diskimages: env-vars: DIB_EPEL_DISABLED: '1' + - name: centos-9-stream + parent: base + pause: false + python-path: /usr/bin/python3 + release: '9-stream' + elements: + - cache-devstack + - centos-minimal + env-vars: + DIB_EPEL_DISABLED: '1' + - name: fedora-34 parent: base pause: false