Merge "Add Linaro London cloud"

playbooks/clouds_layouts.yml

@@ -360,6 +360,28 @@ clouds:
     profiles:
       - openstackci-keypairs
       - openstackci-security
+  - name: openstackci-linaro-london
+    oscc_cloud: openstackci-linaro-london
+    region_name: London
+    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-london
+    oscc_cloud: openstackzuul-linaro-london
+    region_name: London
+    profiles:
+      - openstackci-keypairs
+      - openstackci-security
   - name: openstackci-limestone
     oscc_cloud: openstackci-limestone
     region_name: RegionOne

playbooks/templates/clouds/bridge_all_clouds.yaml.j2

@@ -164,6 +164,26 @@ clouds:
       project_name: '{{ clouds.openstackzuul_linaro_project_name }}'
       project_domain_name: default
       user_domain_name: default
+  openstackci-linaro-london:
+    regions:
+      - London
+    auth:
+      auth_url: https://uk.linaro.cloud:5000
+      username: '{{ clouds.openstackci_linaro_london_username }}'
+      password: '{{ clouds.openstackci_linaro_london_password }}'
+      project_name: '{{ clouds.openstackci_linaro_london_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
+  openstackzuul-linaro-london:
+    regions:
+      - London
+    auth:
+      auth_url: https://uk.linaro.cloud:5000
+      username: '{{ clouds.openstackzuul_linaro_london_username }}'
+      password: '{{ clouds.openstackzuul_linaro_london_password }}'
+      project_name: '{{ clouds.openstackzuul_linaro_london_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
   openstackci-limestone:
     regions:
       - name: RegionOne

playbooks/templates/clouds/bridge_clouds.yaml.j2

@@ -94,6 +94,16 @@ clouds:
       project_name: '{{ clouds.openstackci_linaro_project_name }}'
       project_domain_name: default
       user_domain_name: default
+  openstackci-linaro-london:
+    regions:
+      - London
+    auth:
+      auth_url: https://uk.linaro.cloud:5000
+      username: '{{ clouds.openstackci_linaro_london_username }}'
+      password: '{{ clouds.openstackci_linaro_london_password }}'
+      project_name: '{{ clouds.openstackci_linaro_london_project_name }}'
+      project_domain_name: default
+      user_domain_name: default
   openstackci-limestone:
     regions:
       - name: RegionOne

playbooks/templates/clouds/nodepool_clouds.yaml.j2

@@ -94,6 +94,17 @@ clouds:
       project_name: '{{ nodepool_linaro_project }}'
       project_domain_name: default
       user_domain_name: default
+  linaro-london:
+    regions:
+      - London
+    identity_api_version: '3'
+    auth:
+      auth_url: https://uk.linaro.cloud:5000
+      username: '{{ nodepool_linaro_london_username }}'
+      password: '{{ nodepool_linaro_london_password }}'
+      project_name: '{{ nodepool_linaro_london_project }}'
+      project_domain_name: default
+      user_domain_name: default
   limestone:
     regions:
       - name: RegionOne

playbooks/zuul/templates/group_vars/nodepool.yaml.j2

@@ -16,6 +16,9 @@ nodepool_citycloud_password: password
 nodepool_linaro_username: user
 nodepool_linaro_password: password
 nodepool_linaro_project: project
+nodepool_linaro_london_username: user
+nodepool_linaro_london_password: password
+nodepool_linaro_london_project: project
 nodepool_limestone_username: user
 nodepool_limestone_password: password
 nodepool_limestone_project: project

playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2

@@ -34,6 +34,12 @@ clouds:
   openstackzuul_linaro_username: user
   openstackzuul_linaro_password: password
   openstackzuul_linaro_project_name: project
+  openstackci_linaro_london_username: user
+  openstackci_linaro_london_password: password
+  openstackci_linaro_london_project_name: project
+  openstackzuul_linaro_london_username: user
+  openstackzuul_linaro_london_password: password
+  openstackzuul_linaro_london_project_name: project
   openstackci_limestone_username: user
   openstackci_limestone_password: password
   openstackci_limestone_project_name: project