From ffeb337390a575cfbf4b8610452906f2cf391787 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 18 Jan 2018 12:24:35 -0500 Subject: [PATCH] Minimize nodepool-builder configuration We can remove a lot of these settings as they don't apply to nodepool-builders. Also switch to yaml anchors for provider.diskimages sections. Change-Id: I71570c51d2e07d23ddc71ad696ed6b41e6e93ece Signed-off-by: Paul Belanger --- nodepool/nodepool.yaml | 711 +---------------------------------------- 1 file changed, 12 insertions(+), 699 deletions(-) diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 7528c61be1..4d439c57bb 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -5,33 +5,12 @@ zookeeper-servers: - host: nodepool.openstack.org port: 2181 -labels: - - name: centos-7 - min-ready: 1 - - name: debian-jessie - min-ready: 1 - - name: fedora-26 - min-ready: 1 - - name: fedora-27 - min-ready: 1 - - name: opensuse-423 - min-ready: 1 - - name: tripleo-centos-7 - min-ready: 1 - - name: ubuntu-trusty - min-ready: 1 - - name: ubuntu-xenial - min-ready: 10 - providers: - name: citycloud-kna1 region-name: 'Kna1' cloud: citycloud - boot-timeout: 120 - launch-timeout: 600 - clean-floating-ips: true rate: 0.25 - diskimages: + diskimages: &provider_diskimages - name: centos-7 config-drive: true - name: debian-jessie @@ -46,746 +25,80 @@ providers: config-drive: true - name: ubuntu-xenial config-drive: true - pools: - - name: main - # Disabled until 2018-02-14 at request of citycloud. - # We should contact them before reenabling at this date. - max-servers: 0 - availability-zones: - - nova - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-xenial - key-name: infra-root-keys - name: citycloud-la1 region-name: 'La1' cloud: citycloud - boot-timeout: 120 - launch-timeout: 600 - clean-floating-ips: true rate: 0.25 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 0 - availability-zones: - - nova - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: citycloud-lon1 region-name: 'Lon1' cloud: citycloud - boot-timeout: 120 - launch-timeout: 600 - clean-floating-ips: true rate: 0.25 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - availability-zones: - - nova - max-servers: 50 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: citycloud-sto2 region-name: 'Sto2' cloud: citycloud - boot-timeout: 120 - launch-timeout: 600 - clean-floating-ips: true rate: 0.25 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - availability-zones: - - nova - max-servers: 50 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: infracloud-chocolate region-name: 'RegionOne' cloud: infracloud-chocolate - boot-timeout: 120 rate: 0.25 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 56 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: debian-jessie - key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: fedora-26 - key-name: infra-root-keys - - name: fedora-27 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: 'nodepool' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: ovh-bhs1 region-name: 'BHS1' cloud: ovh - boot-timeout: 120 rate: 0.1 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 159 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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 - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: ovh-gra1 region-name: 'GRA1' cloud: ovh - boot-timeout: 120 rate: 0.1 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 79 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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 - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: inap-mtl01 region-name: 'mtl01' cloud: inap - boot-timeout: 120 - launch-timeout: 600 rate: 0.001 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 190 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: rax-dfw region-name: 'DFW' cloud: rax - boot-timeout: 120 - launch-timeout: 600 rate: 0.001 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 140 - labels: - - name: centos-7 - min-ram: 8192 - flavor-name: 'Performance' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8192 - flavor-name: 'Performance' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8192 - flavor-name: 'Performance' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: rax-iad region-name: 'IAD' cloud: rax - boot-timeout: 120 - launch-timeout: 600 rate: 0.001 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 145 - labels: - - name: centos-7 - min-ram: 8192 - flavor-name: 'Performance' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8192 - flavor-name: 'Performance' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8192 - flavor-name: 'Performance' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: rax-ord region-name: 'ORD' cloud: rax - boot-timeout: 120 - launch-timeout: 600 rate: 0.001 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 195 - labels: - - name: centos-7 - min-ram: 8192 - flavor-name: 'Performance' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - 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' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8192 - flavor-name: 'Performance' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8192 - flavor-name: 'Performance' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages - name: tripleo-test-cloud-rh1 region-name: 'regionOne' cloud: tripleo-test-cloud-rh1 - boot-timeout: 120 rate: 0.001 - clean-floating-ips: true diskimages: - name: centos-7 config-drive: true - pools: - - name: main - max-servers: 60 - networks: - - private - labels: - - name: tripleo-centos-7 - min-ram: 6144 - flavor-name: 'undercloud' - diskimage: centos-7 - key-name: infra-root-keys - name: vexxhost-ca-ymq-1 region-name: 'ca-ymq-1' cloud: vexxhost - boot-timeout: 120 rate: 0.001 - diskimages: - - name: centos-7 - config-drive: true - - name: debian-jessie - config-drive: true - - name: fedora-26 - config-drive: true - - name: fedora-27 - config-drive: true - - name: opensuse-423 - config-drive: true - - name: ubuntu-trusty - config-drive: true - - name: ubuntu-xenial - config-drive: true - pools: - - name: main - max-servers: 0 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: centos-7 - key-name: infra-root-keys - - name: debian-jessie - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: debian-jessie - key-name: infra-root-keys - - name: fedora-26 - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: fedora-26 - key-name: infra-root-keys - - name: fedora-27 - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: fedora-27 - key-name: infra-root-keys - - name: opensuse-423 - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: opensuse-423 - key-name: infra-root-keys - - name: ubuntu-trusty - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: ubuntu-trusty - key-name: infra-root-keys - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: 'v1-standard-8' - diskimage: ubuntu-xenial - key-name: infra-root-keys + diskimages: *provider_diskimages diskimages: - name: centos-7