From 83000bfe8858cff5b4311ef64dad9588188339d3 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 24 Jul 2025 09:03:52 -0700
Subject: [PATCH] Add gitea-lb03

This is a new Noble node. We've had problems with the old existing Jammy
node losing its IPv6 addresses. There are reports that this may affect
systemd-networkd on Jammy. Take the opportunity to boot a new Noble node
to align with the zuul load balancer as well.

Change-Id: I13db5d0859a917f9d76277e449f5dbeadccc11db
---
 hiera/common.yaml                                     |  2 +-
 inventory/base/hosts.yaml                             | 11 +++++++++++
 .../roles/haproxy/templates/docker-compose.yaml.j2    |  4 ----
 testinfra/test_gitea_lb.py                            |  2 +-
 zuul.d/system-config-run.yaml                         |  6 +++---
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/hiera/common.yaml b/hiera/common.yaml
index 1a941cd92a..a14b3604b2 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -16,7 +16,7 @@ cacti_hosts:
 - codesearch02.opendev.org
 - eavesdrop01.opendev.org
 - etherpad02.opendev.org
-- gitea-lb02.opendev.org
+- gitea-lb03.opendev.org
 - gitea09.opendev.org
 - gitea10.opendev.org
 - gitea11.opendev.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index 9444d7da10..4faaa696ac 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -165,6 +165,17 @@ all:
         - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA0Q1rB4LohiDrEEwfQLTdr/9BAsJPgTz1AL5JJFf7re2Prz0bCuvflupfKISgbE1e35mu1NoFdcj8oeZeuTqFfwSvjC8yKwFALZi3XraoffUvh3x85RIFHbJ7heb1kZNtN8yGAMc+mjMU+QBRzTOIiEToQFwbVcrfKsEhpbUE68FLjNXuOyFC+9JPO/T35s+amfKeVaKnzuErD0gXxGw6qDG0j9WD2RmEzbzIIivYDtpigdC06+nEyWOif2CAid7TkLiFreBHmb1pWmybF3dvvM0BE0bqkAehxGbPtKV5KrManUmGqG/F/4N7xW2/UQYgqu6yD53JGqAMWqb3payGKphpxkAF6Gp8yF3fnZhjpopkOzr0oa9JfzC41bdmf06gK7BaGiC7c32V8z09KpwZp2XD79++tqHJLFFCH+tGti/cxdbI48d/CXdHSb/jwybnB/Q3fQTmhYVPl4eWfif275sDSVpoWhUlfnAOUpS+muVubIlXehpAiyaVWCHhro0='
         - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFDl0j5+De1cmxL+X0HOUODWcrUqG1vk+Q7k0BHwiBtGJbxvfL2QgWWvokYZyrNdkZJq0Y0AAwEA6tH47GQ9SGg='
         - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJMh+RSodU5gQtAfEQXdFMFUxYq2SEl4X4u9iIGzbGcZ'
+    gitea-lb03.opendev.org:
+      ansible_host: 38.108.68.97
+      location:
+        cloud: openstackci-vexxhost
+        region_name: sjc1
+      public_v4: 38.108.68.97
+      public_v6: 2604:e100:3:0:f816:3eff:fe5a:c9d7
+      host_keys:
+        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAvV7fFTjYP+vAuCF+4J6ghZpFCap4/1NjrShk9X6kYe'
+        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCUVJTM7UnuwQ2SJq0MB8OnYSr4XMwzfAwk4EPqsnJfpQP2O1rYgmc3598aja52+gr+j6+Dya6Tk/36lMVecohLvDmYB5aRmYjUJvFb8VbunHiS4xeKPTPt4rX3X4H3I+ww1hvzy/nbanTAuH4UZl+VeIHSpbD/X2eJT1X14Xhnft46WcDwvdto7+QfzdBlb9Udx1oABznGi0udJ3Qpg7MVhgsgV1oUCu755DNUBGpluvq+V1P6HIJ2AyhHKUmgbMEmpNyYSZgdEnWlFCZ5xR4o2y+4QEY2g2avkdKRyXrs2siatyU9j9YcYEnQBrvnqsNHDl9a3uBQyYkm5oGuy9PnPAaWttEbLBDxVMSSJ128E3JhdVS0eZ1CbWXsagggyZSp90p0RP6XYdHDXBkuPhflyzguW1GRYGsqW5rQZ73qsosxKaSS3m8VomHAFMpMfTs0TjKS4CWiaONwUDXLCi7qxPcdJ/wBwA2CXsYQHe8GyGSwcD9wk4PXSAtIiKtES18='
+        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIPHJxqswzX0O79ZUtKE1Sr6O+qES3DkUFsYc2fEUhtMVHIE5JhXsfCtmG7pGULf4kAukP1Do3ExtCKpkHDa5DE='
     gitea09.opendev.org:
       ansible_host: 38.108.68.113
       location:
diff --git a/playbooks/roles/haproxy/templates/docker-compose.yaml.j2 b/playbooks/roles/haproxy/templates/docker-compose.yaml.j2
index d9e08e88c7..c017a104c7 100644
--- a/playbooks/roles/haproxy/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/haproxy/templates/docker-compose.yaml.j2
@@ -1,7 +1,3 @@
-# Version 2 is the latest that is supported by docker-compose in
-# Ubuntu Xenial.
-version: '2'
-
 services:
   haproxy:
     restart: always
diff --git a/testinfra/test_gitea_lb.py b/testinfra/test_gitea_lb.py
index 0b8ae73b87..abba806841 100644
--- a/testinfra/test_gitea_lb.py
+++ b/testinfra/test_gitea_lb.py
@@ -15,7 +15,7 @@
 import json
 
 
-testinfra_hosts = ['gitea-lb02.opendev.org']
+testinfra_hosts = ['gitea-lb03.opendev.org']
 
 
 def test_gitea_listening(host):
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 1c89eaa92b..ddaf8831b7 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -610,8 +610,8 @@
     nodeset:
       nodes:
         - <<: *bridge_node_x86
-        - name: gitea-lb02.opendev.org
-          label: ubuntu-jammy
+        - name: gitea-lb03.opendev.org
+          label: ubuntu-noble
         - name: gitea99.opendev.org
           label: ubuntu-jammy
       groups:
@@ -643,7 +643,7 @@
           '/var/gitea/certs': logs
           '/var/gitea/logs': logs
           '/var/log/apache2': logs
-      gitea-lb02.opendev.org:
+      gitea-lb03.opendev.org:
         host_copy_output:
           '/var/lib/haproxy/etc': logs
           '/var/log/haproxy.log': logs