From 0d47c4f241dceb544478fe38018cf168b5781e39 Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Thu, 4 Aug 2022 12:09:58 +0200
Subject: [PATCH] Add nested-virt-ubuntu-jammy nodes

kolla-ansible has switched to Jammy in master, create nodes that allow
their kvm tests to continue to run.

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: I97b59a1dad032665db986ffaf9f7d6fdb45caf26
---
 nodepool/nl02.opendev.org.yaml |  7 +++++++
 nodepool/nl03.opendev.org.yaml | 14 ++++++++++++++
 nodepool/nl04.opendev.org.yaml |  7 +++++++
 3 files changed, 28 insertions(+)

diff --git a/nodepool/nl02.opendev.org.yaml b/nodepool/nl02.opendev.org.yaml
index e0926ebf7b..851fd9785c 100644
--- a/nodepool/nl02.opendev.org.yaml
+++ b/nodepool/nl02.opendev.org.yaml
@@ -47,6 +47,8 @@ labels:
     min-ready: 0
   - name: nested-virt-ubuntu-focal
     min-ready: 0
+  - name: nested-virt-ubuntu-jammy
+    min-ready: 0
   - name: nested-virt-centos-7
     min-ready: 0
   - name: nested-virt-centos-8-stream
@@ -172,6 +174,11 @@ providers:
             flavor-name: 'nodepool.0'
             diskimage: ubuntu-focal
             key-name: infra-root-keys-2020-05-13
+          - name: nested-virt-ubuntu-jammy
+            min-ram: 8000
+            flavor-name: 'nodepool.0'
+            diskimage: ubuntu-jammy
+            key-name: infra-root-keys-2020-05-13
           - name: nested-virt-centos-7
             min-ram: 8000
             flavor-name: 'nodepool.0'
diff --git a/nodepool/nl03.opendev.org.yaml b/nodepool/nl03.opendev.org.yaml
index 464bf8fac3..a0f943fad9 100644
--- a/nodepool/nl03.opendev.org.yaml
+++ b/nodepool/nl03.opendev.org.yaml
@@ -68,6 +68,8 @@ labels:
     min-ready: 0
   - name: nested-virt-ubuntu-focal
     min-ready: 0
+  - name: nested-virt-ubuntu-jammy
+    min-ready: 0
   - name: nested-virt-centos-7
     min-ready: 0
   - name: nested-virt-centos-8-stream
@@ -201,6 +203,11 @@ providers:
             flavor-name: 'v3-standard-8'
             diskimage: ubuntu-focal
             key-name: infra-root-keys-2020-05-13
+          - name: nested-virt-ubuntu-jammy
+            min-ram: 8000
+            flavor-name: 'v3-standard-8'
+            diskimage: ubuntu-jammy
+            key-name: infra-root-keys-2020-05-13
           - name: nested-virt-centos-7
             min-ram: 8000
             flavor-name: 'v3-standard-8'
@@ -348,6 +355,13 @@ providers:
             volume-size: 80
             diskimage: ubuntu-focal
             key-name: infra-root-keys-2020-05-13
+          - name: nested-virt-ubuntu-jammy
+            min-ram: 8000
+            flavor-name: v2-highcpu-8
+            boot-from-volume: true
+            volume-size: 80
+            diskimage: ubuntu-jammy
+            key-name: infra-root-keys-2020-05-13
           - name: nested-virt-centos-7
             min-ram: 8000
             flavor-name: v2-highcpu-8
diff --git a/nodepool/nl04.opendev.org.yaml b/nodepool/nl04.opendev.org.yaml
index dba76c9ee7..fd76ba8f65 100644
--- a/nodepool/nl04.opendev.org.yaml
+++ b/nodepool/nl04.opendev.org.yaml
@@ -31,6 +31,8 @@ labels:
     min-ready: 0
   - name: nested-virt-ubuntu-focal
     min-ready: 0
+  - name: nested-virt-ubuntu-jammy
+    min-ready: 0
   - name: nested-virt-centos-7
     min-ready: 0
   - name: nested-virt-centos-8-stream
@@ -144,6 +146,11 @@ providers:
             flavor-name: ssd-osFoundation-3
             diskimage: ubuntu-focal
             key-name: infra-root-keys-2020-05-13
+          - name: nested-virt-ubuntu-jammy
+            min-ram: 8000
+            flavor-name: ssd-osFoundation-3
+            diskimage: ubuntu-jammy
+            key-name: infra-root-keys-2020-05-13
           - name: nested-virt-centos-7
             min-ram: 8000
             flavor-name: ssd-osFoundation-3