diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index 348ee44b78..2ac2c8fb52 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -179,141 +179,6 @@ providers: diskimage: centos-8 key-name: infra-root-keys-2020-05-13 - - name: openedge-us-east - region-name: 'us-east' - cloud: openedge - boot-timeout: 120 - launch-timeout: 300 - rate: 0.01 - diskimages: *provider_diskimages - pools: - - name: main - max-servers: 0 - labels: - - name: centos-7 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - - name: centos-8 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: centos-8 - key-name: infra-root-keys-2020-05-13 - - name: centos-8-stream - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: centos-8-stream - key-name: infra-root-keys-2020-05-13 - - name: debian-buster - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: debian-buster - key-name: infra-root-keys-2020-05-13 - - name: debian-stretch - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: debian-stretch - key-name: infra-root-keys-2020-05-13 - - name: fedora-31 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: fedora-31 - key-name: infra-root-keys-2020-05-13 - - name: fedora-32 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: fedora-32 - key-name: infra-root-keys-2020-05-13 - - name: gentoo-17-0-systemd - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: gentoo-17-0-systemd - key-name: infra-root-keys-2020-05-13 - - name: opensuse-15 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: opensuse-15 - key-name: infra-root-keys-2020-05-13 - - name: opensuse-tumbleweed - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: opensuse-tumbleweed - key-name: infra-root-keys-2020-05-13 - - name: ubuntu-bionic - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: ubuntu-bionic - key-name: infra-root-keys-2020-05-13 - - name: ubuntu-focal - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: ubuntu-focal - key-name: infra-root-keys-2020-05-13 - - name: ubuntu-xenial - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: ubuntu-xenial - key-name: infra-root-keys-2020-05-13 - - name: nested-virt-ubuntu-bionic - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: ubuntu-bionic - key-name: infra-root-keys-2020-05-13 - - name: nested-virt-ubuntu-focal - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: ubuntu-focal - key-name: infra-root-keys-2020-05-13 - - name: nested-virt-centos-7 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - - name: nested-virt-centos-8 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: centos-8 - key-name: infra-root-keys-2020-05-13 - - name: custom - max-servers: 0 - labels: - - name: centos-7-expanded - min-ram: 16000 - flavor-name: '8cpu-16GBram-80GBdisk' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - - name: ubuntu-bionic-expanded - min-ram: 16000 - flavor-name: '8cpu-16GBram-80GBdisk' - diskimage: ubuntu-bionic - key-name: infra-root-keys-2020-05-13 - - name: multi-numa-ubuntu-bionic - min-ram: 8000 - flavor-name: 'multi-numa' - diskimage: ubuntu-bionic - key-name: infra-root-keys-2020-05-13 - - name: multi-numa-ubuntu-bionic-expanded - min-ram: 16000 - flavor-name: 'multi-numa-expanded' - diskimage: ubuntu-bionic - key-name: infra-root-keys-2020-05-13 - - name: multi-numa-centos-7 - min-ram: 8000 - flavor-name: 'multi-numa' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - - name: multi-numa-centos-7-expanded - min-ram: 16000 - flavor-name: 'multi-numa-expanded' - diskimage: centos-7 - key-name: infra-root-keys-2020-05-13 - - name: ubuntu-bionic-32GB - min-ram: 32000 - flavor-name: '8cpu-32GBram-100GBdisk' - diskimage: ubuntu-bionic - key-name: infra-root-keys-2020-05-13 - - name: airship-kna1 region-name: 'Kna1' cloud: airship-citycloud diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 9c0b8bc95a..8e4953ec78 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -90,12 +90,6 @@ providers: rate: 0.001 diskimages: *provider_diskimages - - name: openedge-us-east - region-name: 'us-east' - cloud: openedge - rate: 0.001 - diskimages: *provider_diskimages - - name: airship-kna1 region-name: 'Kna1' cloud: airship-citycloud