nodepool: Add More Ubuntu 20.04 Definitions

Change-Id: I7b180af892d3063790827e20e9ef5ed05163e422
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index d4d7efd..3ebe01e 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -46,6 +46,10 @@
     min-ready: 0
   - name: charm-zaza-os-ubuntu-focal
     min-ready: 0
+  - name: os-ubuntu2004-small
+    min-ready: 0
+  - name: os-ubuntu2004-large
+    min-ready: 0
 providers:
   - name: openstack-testing
     cloud: openstack-testing
@@ -54,6 +58,9 @@
       - name: pp-base-01
       - name: ubuntu-focal
         username: ubuntu
+      - name: os-ubuntu2004
+        image-name: Ubuntu20.04-iSCSI
+        username: ubuntu
     pools:
       - name: main
         max-servers: 3
@@ -66,6 +73,17 @@
           - "Remote Access"
           - "Nodepool Node"
         labels:
+          - name: os-ubuntu2004-small
+            flavor-name: m1.small
+            cloud-image: os-ubuntu2004
+            key-name: spfactory-zuul-nodepool-key
+            boot-from-volume: True
+          - name: os-ubuntu2004-large
+            flavor-name: m1.xlarge
+            cloud-image: os-ubuntu2004
+            key-name: spfactory-zuul-nodepool-key
+            boot-from-volume: True
+            volume-size: 100
           - name: centos-base
             cloud-image: pp-base-01
             flavor-name: m1.xlarge