Merge "Flip nl01.openstack.org to nl01.opendev.org"

This commit is contained in:
Zuul 2021-03-16 21:02:25 +00:00 committed by Gerrit Code Review
commit 688c371757
2 changed files with 20 additions and 20 deletions

View File

@ -14,18 +14,32 @@ zookeeper-servers:
# another launcher will need to assume this logic.
labels:
- name: centos-7
min-ready: 1
- name: centos-8
min-ready: 1
- name: centos-8-stream
min-ready: 1
- name: debian-buster
min-ready: 1
- name: debian-stretch
min-ready: 1
- name: fedora-31
min-ready: 1
- name: fedora-32
min-ready: 1
- name: gentoo-17-0-systemd
min-ready: 1
- name: opensuse-15
min-ready: 1
- name: opensuse-tumbleweed
min-ready: 1
- name: ubuntu-bionic
# Common job platform
min-ready: 10
- name: ubuntu-focal
min-ready: 1
- name: ubuntu-xenial
min-ready: 1
providers:
- name: rax-dfw
@ -63,7 +77,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 0
max-servers: 140
labels: &provider_pools_labels
- name: centos-7
min-ram: 8192
@ -139,7 +153,7 @@ providers:
diskimages: *provider_diskimages
pools:
- name: main
max-servers: 0
max-servers: 145
labels: *provider_pools_labels
- name: rax-ord
@ -151,7 +165,7 @@ providers:
diskimages: *provider_diskimages
pools:
- name: main
max-servers: 0
max-servers: 195
labels:
labels: *provider_pools_labels

View File

@ -14,32 +14,18 @@ zookeeper-servers:
# another launcher will need to assume this logic.
labels:
- name: centos-7
min-ready: 1
- name: centos-8
min-ready: 1
- name: centos-8-stream
min-ready: 1
- name: debian-buster
min-ready: 1
- name: debian-stretch
min-ready: 1
- name: fedora-31
min-ready: 1
- name: fedora-32
min-ready: 1
- name: gentoo-17-0-systemd
min-ready: 1
- name: opensuse-15
min-ready: 1
- name: opensuse-tumbleweed
min-ready: 1
- name: ubuntu-bionic
# Common job platform
min-ready: 10
- name: ubuntu-focal
min-ready: 1
- name: ubuntu-xenial
min-ready: 1
providers:
- name: rax-dfw
@ -77,7 +63,7 @@ providers:
config-drive: true
pools:
- name: main
max-servers: 140
max-servers: 0
labels: &provider_pools_labels
- name: centos-7
min-ram: 8192
@ -153,7 +139,7 @@ providers:
diskimages: *provider_diskimages
pools:
- name: main
max-servers: 145
max-servers: 0
labels: *provider_pools_labels
- name: rax-ord
@ -165,7 +151,7 @@ providers:
diskimages: *provider_diskimages
pools:
- name: main
max-servers: 195
max-servers: 0
labels:
labels: *provider_pools_labels