From 18c490d15a92978d915000ebe35151d1218fbe1c Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Mon, 18 May 2020 18:08:57 +0200
Subject: [PATCH] Add Ubuntu Focal for AArch64

ubuntu-focal-arm64 in all places where ubuntu-bionic-arm64 is present

Change-Id: I2613f3bc122c187ae944e0ab23246e92be4c3faa
---
 grafana/create-nodepool-dib.sh   |  1 +
 nodepool/nb03.openstack.org.yaml | 17 +++++++++++++++++
 nodepool/nl03.openstack.org.yaml | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh
index 207e1c7fd8..840da7f319 100755
--- a/grafana/create-nodepool-dib.sh
+++ b/grafana/create-nodepool-dib.sh
@@ -24,6 +24,7 @@ create "Debian Stretch" "debian-stretch"
 create "Gentoo" "gentoo-17-0-systemd"
 create "openSUSE 15.1" "opensuse-15"
 create "openSUSE Tumbleweed" "opensuse-tumbleweed"
+create "Ubuntu Focal arm64" "ubuntu-focal-arm64"
 create "Ubuntu Bionic arm64" "ubuntu-bionic-arm64"
 create "Ubuntu Xenial arm64" "ubuntu-xenial-arm64"
 
diff --git a/nodepool/nb03.openstack.org.yaml b/nodepool/nb03.openstack.org.yaml
index dc063850df..392ccb18be 100644
--- a/nodepool/nb03.openstack.org.yaml
+++ b/nodepool/nb03.openstack.org.yaml
@@ -31,6 +31,14 @@ providers:
           os_command_line: "console=ttyAMA0"
           hw_disk_bus: scsi
           hw_scsi_model: virtio-scsi
+      - name: ubuntu-focal-arm64
+        pause: false
+        config-drive: true
+        meta:
+          hw_firmware_type: uefi
+          os_command_line: "console=ttyAMA0"
+          hw_disk_bus: scsi
+          hw_scsi_model: virtio-scsi
       - name: debian-buster-arm64
         pause: false
         config-drive: true
@@ -108,6 +116,15 @@ diskimages:
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
+  - name: ubuntu-focal-arm64
+    parent: base-debuntu
+    elements:
+      - ubuntu-minimal
+    release: focal
+    env-vars:
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.regionone.linaro-us.opendev.org/ubuntu-ports'
+      DIB_DEBIAN_COMPONENTS: 'main,universe'
+
   - name: debian-buster-arm64
     parent: base-debuntu
     elements:
diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml
index 703e46a318..d45d0e580d 100644
--- a/nodepool/nl03.openstack.org.yaml
+++ b/nodepool/nl03.openstack.org.yaml
@@ -36,6 +36,8 @@ labels:
   - name: ubuntu-xenial
   - name: ubuntu-xenial-arm64
     min-ready: 1
+  - name: ubuntu-focal-arm64
+    min-ready: 0
   - name: ubuntu-bionic-arm64
     min-ready: 1
   - name: ubuntu-bionic-arm64-large
@@ -403,6 +405,8 @@ providers:
         config-drive: true
       - name: ubuntu-bionic-arm64
         config-drive: true
+      - name: ubuntu-focal-arm64
+        config-drive: true
     pools:
       - name: main
         max-servers: 40
@@ -437,6 +441,11 @@ providers:
             flavor-name: 'm1.xxlarge'
             diskimage: ubuntu-bionic-arm64
             key-name: infra-root-keys-2020-05-13
+          - name: ubuntu-focal-arm64
+            min-ram: 8000
+            flavor-name: 'os.large'
+            diskimage: ubuntu-focal-arm64
+            key-name: infra-root-keys-2020-05-13
 
 diskimages:
   - name: centos-7
@@ -454,5 +463,6 @@ diskimages:
   - name: ubuntu-bionic
   - name: ubuntu-bionic-arm64
   - name: ubuntu-focal
+  - name: ubuntu-focal-arm64
   - name: ubuntu-xenial
   - name: ubuntu-xenial-arm64