From 5a27433022cd85c7654aed1b0e2c0b86ff34f92a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 30 Jun 2025 11:44:37 -0700 Subject: [PATCH] Replace zk04 with zk03 This replaces the old zk04 server with a new zk03 server. This is part of Noble replacements for older servers. Note that zk04 was also our test node and I've updated that node to be zk99 in testing. This way we don't need to update our tests the next time we replace zookeeper servers. Change-Id: Icb33befb9042a1d09358a6918df9576127b68931 --- doc/source/nodepool.rst | 4 ++-- hiera/common.yaml | 2 +- inventory/base/hosts.yaml | 16 ++++++++-------- .../inventory_plugins/test-fixtures/results.yaml | 2 +- testinfra/test_zookeeper.py | 8 ++++---- zuul.d/system-config-run.yaml | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index 779ebde7a2..8fd3189978 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -21,7 +21,7 @@ At a Glance * nb07.opendev.org * zk01.opendev.org * zk02.opendev.org - * zk04.opendev.org + * zk03.opendev.org :Puppet: * https://opendev.org/opendev/puppet-openstackci/src/branch/master/manifests/nodepool_builder.pp :Configuration: @@ -51,7 +51,7 @@ Zookeeper ========= Nodepool stores image metadata in ZooKeeper. We have a three-node -ZooKeeper cluster running on zk04.opendev.org - zk06.opendev.org. +ZooKeeper cluster running on zk01.opendev.org - zk03.opendev.org. The Nodepool CLI should be sufficient to examine and alter any of the information stored in ZooKeeper. However, in case advanced debugging diff --git a/hiera/common.yaml b/hiera/common.yaml index 9d1584b247..ce850d2f5e 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -75,7 +75,7 @@ cacti_hosts: - ze12.opendev.org - zk01.opendev.org - zk02.opendev.org -- zk04.opendev.org +- zk03.opendev.org - zl01.opendev.org - zl02.opendev.org - zm01.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 86bf81ff3c..a8fd3a8ee4 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -831,17 +831,17 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwrBKCOyrelIuZUW4VJ9tYqUN/IB5Xkg42EsufqRQPOqN6lImRSftUHxXWrm0LppCl+vdGkqiGVd7egidQt5uKcIC599/qORQW1VCQws1TkUu61bCqXvXjlJA6egSXwbxXhtV02Z7BtbmeZYkVbkSxnraA8lilK7jlUvgWeNd/qvTIKI9Dz1INtxs+RwEAfQCo6oa8QdXPqxF9SV1q7Vkdf7ONgj6RdjGMTCNKDV/YCT8NQXMdpWIzLcG3h63KcPXplVB2raKtNIMVN2sUV6FOg9pGLOnf7jJyAXam15vI/NG7ZDltK8gnrQ4BrEH4k4u7JAkHvYELskBJXh+ALBQwcbj0Yy05eGda8GsB9kGlzh3inyQ38qzN4cN87FRZHz+HuxUmNFHCmmeoKX/Kv53svOWaJbau0wnUtSCyvEAd6+4/Xf1ZhebuR0jMIDkWr8R/XmJAyIN2knP8s+VF4n1JU4z06gFDDK93mUG/dNiQkxy22nVSGGiAsU2anjV27vc=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMCs5Z9dewNbdQYn29C/I8AYtn4OH9G0wGfmioVKy6Yuacq9wEO/gowbyqN7CP6amXvJAUpSaruFbod/E3h/sGw=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHlQY0/PoCo9kOcDm81GNIbygH95DuCY2StZFtepfepL' - zk04.opendev.org: - ansible_host: 104.130.253.62 + zk03.opendev.org: + ansible_host: 104.239.143.6 location: cloud: openstackci-rax - region_name: DFW - public_v4: 104.130.253.62 - public_v6: 2001:4800:7818:103:be76:4eff:fe03:e80d + region_name: DFW + public_v4: 104.239.143.6 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:3b82 host_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDNmgLg0YyYSqt4CPkI0c3oYk2PItCJ58AFC0tlFYxhU' - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLoFGNqgPlFjJmJGOmTctsY2IOJ99XPvc9I05ofTQ5VzCc3z2FoVCx2Z4Rs/6LW7m0ba0u5BLpM8lgkeQy1C4CKeIfbgkcdUzdgNSycezZZueV5sVWzCm99DjXkaOKLr/mWxCDSQzwr59A9lqVH3A1TY670czFlnhdjTz03TmSXfvmNeBmIlYGku7QzUWIHulbc13sVgbarSf1sxxFWGa5kfmdBtQxXcrvaDPkqRLw2u1I25Lp+rRxMqFnD9eTfglxnKR5foPEAYDnPANCWV/UsbVhDqPeT24btaMoIHVjOtTcmko4hkI1SySuiR1ioQVaKcTVu6Nyqdwhgw3RLpdrKzvw8AEMFyBAb5ybYLMl6GGCmicpxm/u8WZXpV4QLRNwvdsqE/kmg3A2c4stBk5oFOnsmDEWV2u5R6fT/Cdfdh7SGW+q2dLQYH1LfsVG5KiwmleJE6wkkS+Q/wzfg7f3gut/OTmDC742ZJSgLw1j515j+lBdhj7tpxDZNjS5fUk=' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBN4+2yrhZFi0CfV6ifRN1an6+iKtyd6r6nQsd2mJa2tZPd1ch8JYvT/IruocrlaGR/ef0yFJ/Ayi1mYCGCI1skM=' + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2yWK6yCb3eTu7mNhMG/MdAetet8KKw81YgkIc4kOuJ+Mjw3rUR603FpZ+ckuJCNq3rloFKBOrdd/0cjKk6qk6lTINcT0F6otL/5vevhnJtLXNhcO4caqqmRqDwq/R1W1UcMYATKujQVhbX+Uvmi8ETE5GR3bszVnqCDbrShulw/EOEYS+nxQvHdtkW0XpswQWYIXwtrN35RtXh8emqVIgl+O8gOTlGQGTZseeomYTr+MtGFu25hThOgKVQDHQNLwj1E7eNdGt3XaXM51e74cG8gk6PcruG6iOgoTS9+B0us2DYd0c4xfS8/5TOQYWb605zvq8U0Wgyi+pVI3NOV9FdsqQD6L4J03vr9zrPpN1EsL9tYtzRLbCWPh1UCkG7sKSo4qYxZOfIwo9ppTEGO3+xot9SwMog7w2o3kAP6kP53jsvxNXUG5CseHFb5uGJylkjYEv85CV/o4k64pJGtyMCa1ENcR1xGXZODfu5e6u9KoIoApmRJ3ezCYug0l8hgU=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMskqMPrdJr6QiXCoM8LaOOc7vS7rHOm1pm67thhu/4e3KWOjHOhO6Byt1s7mdMNeNhpy8QrAXjKniw+lNud97s=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEYF/dz0xgaKWs+1JP+8keFIU2IF4QoXKql8k6LnsgsE' zl01.opendev.org: ansible_host: 104.239.145.221 location: diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml index 38c0275b2a..6c7f7e017c 100644 --- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml +++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml @@ -42,5 +42,5 @@ results: - zuul - zuul-executor - zk04.opendev.org: + zk99.opendev.org: - zookeeper diff --git a/testinfra/test_zookeeper.py b/testinfra/test_zookeeper.py index 5a4b1ebc78..cb49aafb01 100644 --- a/testinfra/test_zookeeper.py +++ b/testinfra/test_zookeeper.py @@ -16,19 +16,19 @@ import json import util -testinfra_hosts = ['zk04.opendev.org'] +testinfra_hosts = ['zk99.opendev.org'] def test_id_file(host): # Test that wacky hostname regex works myid = host.file('/var/zookeeper/data/myid') - assert myid.content == b'4\n' + assert myid.content == b'99\n' def test_zk_myid_is_set(host): # Test that our wacky hostname regex results in the correct # myid value in the running service. cmd = host.run("docker logs zookeeper-compose-zk-1") - assert "[myid:4]" in cmd.stdout + assert "[myid:99]" in cmd.stdout def test_zk_listening(host): zk = host.socket("tcp://0.0.0.0:2181") @@ -64,7 +64,7 @@ def test_zookeeper_statsd_running(host): def test_zk_2181_accessibility(host): # Ask the host to report its own IP addresses. This will use our test # local /etc/hosts values and not DNS. - zk = host.addr("zk04.opendev.org") + zk = host.addr("zk99.opendev.org") # Verify it is using our local /etc/hosts values print(zk.ipv4_addresses) print(zk.ipv6_addresses) diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 1f03692af6..f5834fe2aa 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -333,7 +333,7 @@ nodeset: nodes: - <<: *bridge_node_x86 - - name: zk04.opendev.org + - name: zk99.opendev.org label: ubuntu-noble - name: nl05.opendev.org label: ubuntu-noble @@ -925,7 +925,7 @@ nodeset: nodes: - <<: *bridge_node_x86 - - name: zk04.opendev.org + - name: zk99.opendev.org label: ubuntu-noble groups: - <<: *bastion_group @@ -974,7 +974,7 @@ nodeset: nodes: - <<: *bridge_node_x86 - - name: zk04.opendev.org + - name: zk99.opendev.org label: ubuntu-noble - name: zm01.opendev.org label: ubuntu-noble