diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index 3c83e45ac3..4e0fdde557 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -16,6 +16,7 @@ At a Glance * nl02.opendev.org * nl03.opendev.org * nl04.opendev.org + * nl06.opendev.org * nb05.opendev.org * nb06.opendev.org * nb07.opendev.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 95e91d2273..9e2876d7af 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -38,6 +38,7 @@ cacti_hosts: - nl02.opendev.org - nl03.opendev.org - nl04.opendev.org +- nl06.opendev.org - ns03.opendev.org - ns04.opendev.org - paste.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index c3922b7824..107dccc1d6 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -545,6 +545,17 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCjyQFfbChdZ3vmhwCURHNjvsXdlS3OTVXOIVcRQWksEXUyZ9boIdahchZ2A+QPAUpPVFdDaE1pa9YV5OlYJ5eUVVJNdpgShsShAiPdValN5/xp8fiDfLkXzgmVqZWXQgMN4plvMqFzLQJ6AwZ/8/fr2ibdpn8SPvN2MAcqYfmLsGTcxamPIT2KbRTJfluox7HbNKPL5m3oDgOxDLS7CheCAOc28xfPD+9ToRsRYVCmxtgyadSDCcmsKAW2MeERmyAkwtk7cj/Xk02l4UKkQa/vSJ9fXlAeuVJYxMCXC1NcDhgetuRpYE0i+I69fqlH7cKrrY2AVHINt/fY9YKWcpcYEaNDpK1zslNyfCJEoP/LA+7LiC/DPPl8wGVvciPS388nYQiUqcTgZIduRLIoqjY+elyFUwNOtQuQjrw50zSL+t05gNp/uacgLw1eLBxx5WOMqWvP749fp+dIPLGCiYSYc19UjjVwb9YQEzj6hh+IYXUVsG2xmKgrxworUDxUhkE=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKsn/AsbXB708dzc4YeKFDTwRY6Z9dtjkMRWqr4nbhIz9ZlUxZb/xqwHdpBvBw0uZ4Hp9tEC9ZpVLefeCMdZBrc=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFIJlwjkk23o66fxe3AzedfsHx3zTKfyWV65OKlxMdcw' + nl06.opendev.org: + ansible_host: 104.239.145.44 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.239.145.44 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:438f + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCYQSFMY05aR8e4GgxWmTWSEaRB9Rot0afWaPhwMkvRDUwADlpss9r7El14NOl3/V9Uk4r0TKgNNuRMLMCtlCWz78UZrCGOl7GSqHByIjIupr8aSNnynzywjPbPEiN/fAAoz+1v494w07NZ1i4W0UB3JeCjJAgXvAOmzK9JGIxxAvC/NS5gpnJKc+pwLCzLncZ6qxj+eVVyHo3cHHiEPV2kfGMrlwxK5Ob1k7FNUzaxR1BYk5HKGzzvTrYkq9D3V7If+sQv6qPg3XFUR2swT2UizjBNKzRUCr0xahfwrRiK7sROX9vHA0RV/VBIgewcSilvJ9w973Xu0OIYnVjrrmA/ZbgaTw6rqxao8kGxVXVHxl/LuULDr52E3aGVNYaHQeJPM3PkIQ1IeqCZ+ixlcwetD3M4KyD6YHjL6V17UE4zPBvBdn2sto3CM9W+OdtQjZl4fAqbkJnma/hxPsEXgvjjE6b/2wKXZNfjo05zATpAKebRTGrwmyo/VToAFlp5dLM=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMr1BD0uspJcd3jz/FUYLZZhnEumvvrqvPqRaX2BoMuMuuWfrfjSHb3Lnzed+8bo7n82tTgNXkK+yUZ6s22X3CE=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHKBBrUdGxlS0DFVhbOlCOIE7cUkmiLsDf9vKaAJkCqG' ns03.opendev.org: ansible_host: 104.239.145.127 location: diff --git a/testinfra/test_nodepool.py b/testinfra/test_nodepool.py index 4a5fa02bde..26a843abe4 100644 --- a/testinfra/test_nodepool.py +++ b/testinfra/test_nodepool.py @@ -14,7 +14,7 @@ import pytest -testinfra_hosts = ['nl01.opendev.org', 'nb05.opendev.org'] +testinfra_hosts = ['nl05.opendev.org', 'nb05.opendev.org'] def test_clouds_yaml(host): @@ -33,11 +33,11 @@ def test_kube_config(host): assert b'nodepool_k8s_key' in kubeconfig.content def test_launcher_container_running(host): - if host.backend.get_hostname() != 'nl01.opendev.org': + if host.backend.get_hostname() != 'nl05.opendev.org': pytest.skip() cmd = host.run("docker ps -a --format '{{ .Names }}'") - assert 'nodepool-docker_nodepool-launcher_1' in cmd.stdout + assert 'nodepool-docker-nodepool-launcher-1' in cmd.stdout def test_builder_container_running(host): if host.backend.get_hostname() != 'nb05.opendev.org': diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index a721e16b70..97b78ccd3e 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -335,8 +335,8 @@ - <<: *bridge_node_x86 - name: zk04.opendev.org label: ubuntu-focal - - name: nl01.opendev.org - label: ubuntu-focal + - name: nl05.opendev.org + label: ubuntu-noble - name: nb05.opendev.org label: ubuntu-noble groups: @@ -345,7 +345,7 @@ - opendev/system-config - openstack/project-config host-vars: - nl01.opendev.org: + nl05.opendev.org: host_copy_output: '/etc/nodepool/nodepool.yaml': logs '/var/log/nodepool/launcher-debug.log': logs