Merge "Remove absentee clouds from cloud launcher"

playbooks/clouds_layouts.yml

@@ -270,30 +270,6 @@ clouds:
         network: ext-net
         interfaces:
           - openstackzuul-subnet1
-  - name: openstackci-citycloud-La1
-    oscc_cloud: openstackci-citycloud
-    region_name: La1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackci-networking
-    routers:
-      - name: openstackci-router1
-        network: ext-net
-        interfaces:
-          - openstackci-subnet1
-  - name: openstackzuul-citycloud-La1
-    oscc_cloud: openstackzuul-citycloud
-    region_name: La1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-      - openstackzuul-networking
-    routers:
-      - name: openstackzuul-router1
-        network: ext-net
-        interfaces:
-          - openstackzuul-subnet1
   - name: openstackci-citycloud-Kna1
     oscc_cloud: openstackci-citycloud
     region_name: Kna1
@@ -342,28 +318,8 @@ clouds:
         network: ext-net
         interfaces:
           - openstackzuul-subnet1
-  - name: openstackci-linaro
-    oscc_cloud: openstackci-linaro
-    region_name: RegionOne
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-    images:
-      - name: ubuntu-xenial
-        download_image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-arm64-uefi1.img
-        download_image_dest: /tmp/ubuntu-xenial-aarch64-uefi.img
-        filename: /tmp/ubuntu-xenial-aarch64-uefi.img
-        properties:
-          hw_firmware_type: uefi
-          os_command_line: console=ttyAMA0
-          hw_disk_bus: scsi
-          hw_scsi_model: virtio-scsi
-  - name: openstackzuul-linaro
-    oscc_cloud: openstackzuul-linaro
-    region_name: RegionOne
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
+
+  # Linaro
   - name: openstackci-linaro-london
     oscc_cloud: openstackci-linaro-london
     region_name: London
@@ -386,6 +342,8 @@ clouds:
     profiles:
       - openstackci-keypairs
       - openstackci-security
+
+  # Limestone
   - name: openstackci-limestone
     oscc_cloud: openstackci-limestone
     region_name: RegionOne
@@ -398,49 +356,8 @@ clouds:
     profiles:
       - openstackci-keypairs
       - openstackci-security
-  - name: openstackci-packethost
-    oscc_cloud: openstackci-packethost
-    region_name: us-west-1
-    profiles:
-      - openstackci-keypairs
-      # Disabled because this account is an admin account and sees
-      # the default security group for every project in the cloud.
-      # Results in:
-      #   FAILED! => {"changed": false, "msg": "Multiple matches found for default"}
-      # Reenable if os_security_group grows a project filter or some other
-      # method of deduplication.
-      #- openstackci-security
-  - name: openstackzuul-packethost
-    oscc_cloud: openstackzuul-packethost
-    region_name: us-west-1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-
-# Arm64 CI Cloud
-  - name: openstackci-arm64ci
-    oscc_cloud: openstackci-arm64ci
-    region_name: nrt1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
-    images:
-      - name: ubuntu-xenial
-        download_image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-arm64-uefi1.img
-        download_image_dest: /tmp/ubuntu-xenial-aarch64-uefi.img
-        filename: /tmp/ubuntu-xenial-aarch64-uefi.img
-        properties:
-          hw_firmware_type: uefi
-          os_command_line: console=ttyAMA0
-          hw_disk_bus: scsi
-          hw_scsi_model: virtio-scsi
-  - name: openstackzuul-arm64ci
-    oscc_cloud: openstackzuul-arm64ci
-    region_name: nrt1
-    profiles:
-      - openstackci-keypairs
-      - openstackci-security
 
+  # Fortnebula
   - name: openstackci-fortnebula
     oscc_cloud: openstackci-fortnebula
     region_name: regionOne