Merge "Set iweb to empty labels and diskimages"

nodepool/nl03.opendev.org.yaml

@@ -95,6 +95,17 @@ providers:
     boot-timeout: 120
     launch-timeout: 600
     rate: 0.001
+    diskimages: []
+    pools:
+      - name: main
+        max-servers: 0
+        labels: []
+
+  - name: vexxhost-ca-ymq-1
+    region-name: 'ca-ymq-1'
+    cloud: vexxhost
+    boot-timeout: 120
+    rate: 0.001
     diskimages: &provider_diskimages
       - name: centos-7
         config-drive: true
@@ -128,97 +139,6 @@ providers:
         config-drive: true
       - name: openEuler-22-03-LTS
         config-drive: true
-    pools:
-      - name: main
-        max-servers: 0
-        labels:
-          - name: centos-7
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: centos-7
-            key-name: infra-root-keys-2020-05-13
-          - name: centos-8-stream
-            min-ram: 8000
-            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'
-            diskimage: debian-bullseye
-            key-name: infra-root-keys-2020-05-13
-          - name: debian-buster
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: debian-buster
-            key-name: infra-root-keys-2020-05-13
-          - name: fedora-35
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: fedora-35
-            key-name: infra-root-keys-2020-05-13
-          - name: fedora-36
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: fedora-36
-            key-name: infra-root-keys-2020-05-13
-          - name: gentoo-17-0-systemd
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: gentoo-17-0-systemd
-            key-name: infra-root-keys-2020-05-13
-          - name: opensuse-15
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: opensuse-15
-            key-name: infra-root-keys-2020-05-13
-          - name: rockylinux-8
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: rockylinux-8
-            key-name: infra-root-keys-2020-05-13
-          - name: rockylinux-9
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: rockylinux-9
-            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-bionic
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: ubuntu-bionic
-            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-focal
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: ubuntu-focal
-            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-jammy
-            min-ram: 8000
-            flavor-name: 'A1.8'
-            diskimage: ubuntu-jammy
-            key-name: infra-root-keys-2020-05-13
-          - name: ubuntu-xenial
-            min-ram: 8000
-            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'
-    cloud: vexxhost
-    boot-timeout: 120
-    rate: 0.001
-    diskimages: *provider_diskimages
     pools:
       - name: main
         max-servers: 50

nodepool/nodepool.yaml

@@ -60,7 +60,7 @@ providers:
     region-name: 'mtl01'
     cloud: iweb
     rate: 0.001
-    diskimages: *provider_diskimages
+    diskimages: []
 
   - name: rax-dfw
     region-name: 'DFW'