diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 8b8dfc9875..82df2d8eb0 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -964,6 +964,17 @@ all: - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEV4wqYrhK6TyA+hMshSyXx8e4C4bwCmeYRtkCoxI9M3' - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDthtGwkkn2dl2Rb8bkv8l9LtFAYjdbarm0kBsWohWSmSIF/wBlPCTkbi3rSWaQ6CCbaNq6k2NoEMxIx5Tawoje54VZ+/n3mX7PFMm6U/sDC2RQB5sNPBoSdyaw1JgEoMN0A9sPTGZe2Rt/gA8wWeqF5WJovtjtqmmONfQJypXYEluVSDHg0lSYvZTrJRhMZ81YKBElZYBBfjXfeDOGCJmikF2ODe2iOtvQ3VljEz8ojZl0WnYnn6VSNHqzClVborePVODB6puQ5SbFh41XtCux41nBgJ3Zn5f5KyygfkuBXnq+9gFT5FhXvbAUdQyA26eM8+U3wKZtWRuZRWRiSKPVaI6CyNghGo7kd3FFBRU5Cvs48EP+6JNnvfHS2gCv1F9Tmg72tO/o4nVv6DcrEeP4w6OvyTikicSEegBP7bspINZBNey+H1mnnmoWXdz5Gzke/0AdFk0m4WKRqH43/RwpHhFvEXf3yO7Gsg30g01KaBR2D+MEDtknE3c6Bu/asK8=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDgWol+vs6UBFupMFZ9cwWmgRCMlJMJgTxAtjgn8PAZr/nt68HHBjKw/DucbLLounTJB6Hk7Krgb+4Vb4dsBdgY=' + zuul-lb02.opendev.org: + ansible_host: 104.130.124.156 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.130.124.156 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:4f1e + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC5Xwri1SOXiWfB5srQyhhyJW03GMKrMFd+/IzTYdv+jJ58Pp9vKM/Xpl8dOxxAlvPcJ37ta9A7XMKTOYGoInc4Bucn+OqrA+3S8cLIUEeHPetgl9F8CgFIC2gL/FPaUKvDG2sfSADmenOEAamJl1mhLPs3twYMtPMKu6qM1NchZb5Ge7AQGpwiAa07xEa9R/tvvigRkK14Qh2pdywwwXiz/yUsysEWv5v+RgYblLo6jS36dwyBFbzoXX0t5/Det6S2RaxxH8xx1W5rsUXkDcr6A/TjDbVyWpGth11i7yJi58H0BNIPjhNst0wuU/C+wo8Ms2c0sbIshG5xd5KNDx6eJ8U4tvi+n5CTXDP0BTrdkcJI5sSiXcPuVtIP8H9At5lSOqaqwP3eOMyOS+kcUEU5rLSNCX7sdg1H+f5c04A/WtY3PeU2nMNWWqOQmq2FhmcL46x2RBS0/QpjxKXDNzO4D0cNkBRWLZHNfTaVW8mvj+ue5FqLmqVGDRuBn1dQtqc=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOA5AOF6zP1wzvtqbcuSbeP//B2ZA1cvGqlb1YKHLf8ZcMM40oyewdggKlogXpVGh7bACq5WVQYJP2T7W/CCF5A=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPtHatUljTe2AbVkT/+ikU8nP2QzFz8MWNaVm5qSt/8a' zuul01.opendev.org: ansible_host: 104.130.246.57 location: diff --git a/testinfra/test_zuul_lb.py b/testinfra/test_zuul_lb.py index a2236cce6c..2543aee2d4 100644 --- a/testinfra/test_zuul_lb.py +++ b/testinfra/test_zuul_lb.py @@ -16,7 +16,7 @@ import json -testinfra_hosts = ['zuul-lb01.opendev.org'] +testinfra_hosts = ['zuul-lb02.opendev.org'] def test_zuul_listening(host): @@ -28,7 +28,7 @@ def test_zuul_listening(host): assert zuul_finger.is_listening def test_haproxy_statsd_running(host): - cmd = host.run("docker inspect haproxy-docker_haproxy-statsd_1") + cmd = host.run("docker inspect haproxy-docker-haproxy-statsd-1") out = json.loads(cmd.stdout) assert out[0]["State"]["Status"] == "running" assert out[0]["RestartCount"] == 0 diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 031b30bc0a..84708d9474 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -976,8 +976,8 @@ label: ubuntu-jammy - name: zuul02.opendev.org label: ubuntu-focal - - name: zuul-lb01.opendev.org - label: ubuntu-focal + - name: zuul-lb02.opendev.org + label: ubuntu-noble - name: zuul-db99.opendev.org label: ubuntu-jammy groups: @@ -1018,7 +1018,7 @@ bridge99.opendev.org: host_copy_output: '/etc/hosts': logs - zuul-lb01.opendev.org: + zuul-lb02.opendev.org: host_copy_output: '/var/haproxy/etc': logs '/var/log/haproxy.log': logs