From 10c8da0e90b71be4f982fa979c8ef9cb05096436 Mon Sep 17 00:00:00 2001
From: Gary Perkins <gary.perkins@codethink.co.uk>
Date: Thu, 13 Sep 2018 21:01:01 +0100
Subject: [PATCH] Add Arm64 CI cloud

Changes:
  * Set URLs to https://
  * Set new keystone domain
  * Set region to nrt1

Change-Id: Ib96d14008ab3b8b7c12429d7432eaa485c404bb2
---
 playbooks/clouds_layouts.yml                  | 24 +++++++++++++++++++
 .../clouds/bridge_all_clouds.yaml.j2          | 24 +++++++++++++++++++
 .../templates/clouds/bridge_clouds.yaml.j2    | 12 ++++++++++
 .../templates/clouds/nodepool_clouds.yaml.j2  | 12 ++++++++++
 .../templates/group_vars/nodepool.yaml.j2     |  3 +++
 .../host_vars/bridge.openstack.org.yaml.j2    |  6 +++++
 6 files changed, 81 insertions(+)

diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml
index d464f437e0..2c5327e7b9 100644
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@@ -412,3 +412,27 @@ clouds:
     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
diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
index 0fd771263f..6f68c91fb6 100644
--- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2
@@ -255,3 +255,27 @@ clouds:
       user_domain_name: default
       project_domain_name: default
     identity_api_version: '3'
+  openstackci-arm64ci:
+    regions:
+      - nrt1
+    auth:
+      auth_url: https://arm64ci.cloud:5000
+      username: '{{ clouds.openstackci_arm64ci_username }}'
+      password: '{{ clouds.openstackci_arm64ci_password }}'
+      project_name: '{{ clouds.openstackci_arm64ci_project_name }}'
+      project_domain_name: openstack-infra
+      user_domain_name: openstack-infra
+      interface: public
+    identity_api_version: '3'
+  openstackzuul-arm64ci:
+    regions:
+      - nrt1
+    auth:
+      auth_url: https://arm64ci.cloud:5000
+      username: '{{ clouds.openstackzuul_arm64ci_username }}'
+      password: '{{ clouds.openstackzuul_arm64ci_password }}'
+      project_name: '{{ clouds.openstackzuul_arm64ci_project_name }}'
+      project_domain_name: openstack-infra
+      user_domain_name: openstack-infra
+      interface: public
+    identity_api_version: '3'
diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2
index 4e52c4487c..62dfb55000 100644
--- a/playbooks/templates/clouds/bridge_clouds.yaml.j2
+++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2
@@ -140,3 +140,15 @@ clouds:
       user_domain_name: default
       project_domain_name: default
     identity_api_version: '3'
+  openstackci-arm64ci:
+    regions:
+      - nrt1
+    auth:
+      auth_url: https://arm64ci.cloud:5000
+      username: '{{ clouds.openstackci_arm64ci_username }}'
+      password: '{{ clouds.openstackci_arm64ci_password }}'
+      project_name: '{{ clouds.openstackci_arm64ci_project_name }}'
+      project_domain_name: openstack-infra
+      user_domain_name: openstack-infra
+      interface: public
+    identity_api_version: '3'
diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
index 8d66e163f0..8dcb72a879 100644
--- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2
+++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2
@@ -141,3 +141,15 @@ clouds:
       project_domain_name: default
     identity_api_version: '3'
     image_format: 'raw'
+  arm64ci:
+    regions:
+      - nrt1
+    identity_api_version: '3'
+    auth:
+      auth_url: https://arm64ci.cloud:5000
+      username: '{{ nodepool_arm64ci_username }}'
+      password: '{{ nodepool_arm64ci_password }}'
+      project_name: '{{ nodepool_arm64ci_project }}'
+      project_domain_name: openstack-infra
+      user_domain_name: openstack-infra
+      interface: public
diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
index 100bad1318..9f3b361426 100644
--- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
@@ -25,3 +25,6 @@ nodepool_limestone_project: project
 nodepool_packethost_username: user
 nodepool_packethost_password: password
 nodepool_packethost_project: project
+nodepool_arm64ci_username: user
+nodepool_arm64ci_password: password
+nodepool_arm64ci_project: project
diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
index 80cbfc5deb..b8db828e23 100644
--- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
+++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
@@ -52,3 +52,9 @@ clouds:
   openstackzuul_packethost_username: user
   openstackzuul_packethost_password: password
   openstackzuul_packethost_project_name: project
+  openstackci_arm64ci_username: user
+  openstackci_arm64ci_password: password
+  openstackci_arm64ci_project_name: project
+  openstackzuul_arm64ci_username: user
+  openstackzuul_arm64ci_password: password
+  openstackzuul_arm64ci_project_name: project