Merge "Remove labels and diskimages from the linaro cloud"

nodepool/nb04.opendev.org.yaml

@@ -18,6 +18,14 @@ providers:
     rate: 0.25
     # 6 hours
     image-upload-timeout: 21600
+    diskimages: []
+
+  - name: osuosl-regionone
+    region-name: 'RegionOne'
+    cloud: osuosl
+    rate: 0.25
+    # 6 hours
+    image-upload-timeout: 21600
     diskimages: &arm64_diskimages
       - name: ubuntu-bionic-arm64
         pause: false
@@ -100,14 +108,6 @@ providers:
           hw_disk_bus: scsi
           hw_scsi_model: virtio-scsi
 
-  - name: osuosl-regionone
-    region-name: 'RegionOne'
-    cloud: osuosl
-    rate: 0.25
-    # 6 hours
-    image-upload-timeout: 21600
-    diskimages: *arm64_diskimages
-
 diskimages:
   - name: base
     abstract: True

nodepool/nl03.opendev.org.yaml

@@ -374,94 +374,14 @@ providers:
     boot-timeout: 600
     launch-timeout: 800
     rate: 0.001
-    diskimages:
+    diskimages: []
-      - name: centos-9-stream-arm64
-        config-drive: true
-      - name: centos-8-stream-arm64
-        config-drive: true
-      - name: debian-bookworm-arm64
-        config-drive: true
-      - name: debian-bullseye-arm64
-        config-drive: true
-      - name: ubuntu-bionic-arm64
-        config-drive: true
-      - name: ubuntu-focal-arm64
-        config-drive: true
-      - name: ubuntu-jammy-arm64
-        config-drive: true
-      - name: ubuntu-noble-arm64
-        config-drive: true
-      - name: openEuler-22-03-LTS-arm64
-        config-drive: true
-      - name: rockylinux-9-arm64
-        config-drive: true
     pools:
       - name: main
         # Network assignment is 147.28.149.96/27, one host is the
         # mirror node.
         # Set to zero in preparation for cloud shutdown
         max-servers: 0
-        labels:
+        labels: []
-          - name: centos-9-stream-arm64
-            flavor-name: 'opendev'
-            diskimage: centos-9-stream-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: centos-8-stream-arm64
-            flavor-name: 'opendev'
-            diskimage: centos-8-stream-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: debian-bookworm-arm64
-            flavor-name: 'opendev'
-            diskimage: debian-bookworm-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: debian-bullseye-arm64
-            flavor-name: 'opendev'
-            diskimage: debian-bullseye-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-bionic-arm64
-            flavor-name: 'opendev'
-            diskimage: ubuntu-bionic-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-bionic-arm64-16C-16GB
-            flavor-name: 'opendev-16C-16GB'
-            diskimage: ubuntu-bionic-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-focal-arm64
-            flavor-name: 'opendev'
-            diskimage: ubuntu-focal-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-focal-arm64-16C-16GB
-            flavor-name: 'opendev-16C-16GB'
-            diskimage: ubuntu-focal-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-jammy-arm64
-            flavor-name: 'opendev'
-            diskimage: ubuntu-jammy-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-noble-arm64
-            flavor-name: 'opendev'
-            diskimage: ubuntu-noble-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-jammy-arm64-16C-16GB
-            flavor-name: 'opendev-16C-16GB'
-            diskimage: ubuntu-jammy-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: ubuntu-noble-arm64-16C-16GB
-            flavor-name: 'opendev-16C-16GB'
-            diskimage: ubuntu-noble-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: openEuler-22-03-LTS-arm64-16C-16GB
-            flavor-name: 'opendev-16C-16GB'
-            diskimage: openEuler-22-03-LTS-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: rockylinux-9-arm64
-            flavor-name: 'opendev'
-            diskimage: rockylinux-9-arm64
-            key-name: infra-root-keys-2024-04-08
-          - name: rockylinux-9-arm64-16C-16GB
-            flavor-name: 'opendev-16C-16GB'
-            diskimage: rockylinux-9-arm64
-            key-name: infra-root-keys-2024-04-08
 
   - name: osuosl-regionone
     region-name: 'RegionOne'