From 8d4f1c719ea8b9035b938d0e1ab953752ae56f8a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 13 Oct 2022 13:09:13 -0700
Subject: [PATCH] Add Jammy gitea-lb02 to our inventory

This adds our first Jammy production server to the mix. We update the
gitea load balancer as it is a fairly simple service which will allow us
to focus on Jammy updates and not various server updates.

We update testing to shift testing to a jammy node as well. We don't
remove gitea-lb01 yet as this will happen after we switch DNS over to
the new server and are happy with it.

Change-Id: I8fb992e23abf9e97756a3cfef996be4c85da9e6f
---
 hiera/common.yaml             | 1 +
 inventory/base/hosts.yaml     | 7 +++++++
 testinfra/test_gitea_lb.py    | 2 +-
 zuul.d/system-config-run.yaml | 6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 8511fde2b0..84d5c4650f 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -16,6 +16,7 @@ cacti_hosts:
 - eavesdrop01.opendev.org
 - etherpad01.opendev.org
 - gitea-lb01.opendev.org
+- gitea-lb02.opendev.org
 - gitea01.opendev.org
 - gitea02.opendev.org
 - gitea03.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 5780f5491a..600b01c8c3 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -104,6 +104,13 @@ all:
         cloud: openstackci-vexxhost
         region_name: sjc1
       public_v4: 38.108.68.124
+    gitea-lb02.opendev.org:
+      ansible_host: 38.108.68.66
+      location:
+        cloud: openstackci-vexxhost
+        region_name: sjc1
+      public_v4: 38.108.68.66
+      public_v6: 2604:e100:3:0:f816:3eff:fea7:28c6
     gitea01.opendev.org:
       ansible_host: 38.108.68.172
       location:
diff --git a/testinfra/test_gitea_lb.py b/testinfra/test_gitea_lb.py
index 18d7c2d2cb..69480b0c7b 100644
--- a/testinfra/test_gitea_lb.py
+++ b/testinfra/test_gitea_lb.py
@@ -15,7 +15,7 @@
 import json
 
 
-testinfra_hosts = ['gitea-lb01.opendev.org']
+testinfra_hosts = ['gitea-lb02.opendev.org']
 
 
 def test_gitea_listening(host):
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index a720ef0fcf..0612ecebea 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -588,8 +588,8 @@
       nodes:
         - name: bridge.openstack.org
           label: ubuntu-bionic
-        - name: gitea-lb01.opendev.org
-          label: ubuntu-bionic
+        - name: gitea-lb02.opendev.org
+          label: ubuntu-jammy
         - name: gitea99.opendev.org
           label: ubuntu-bionic
     required-projects:
@@ -619,7 +619,7 @@
           '/var/gitea/certs': logs
           '/var/gitea/logs': logs
           '/var/log/apache2': logs
-      gitea-lb01.opendev.org:
+      gitea-lb02.opendev.org:
         host_copy_output:
           '/var/haproxy/etc': logs
           '/var/log/haproxy.log': logs