From a74b7473ad2bb7786fd6bea88f5dbb8f2ed187d2 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 24 Mar 2025 12:56:24 -0700 Subject: [PATCH] Cleanup nl01, nl02, nl03, nl04 At this point all four of these servers have been replaced by new Noble nodepool launchers. When we are happy with the new servers we should land this change and remove the other servers from our inventory so that they can be deleted. Change-Id: Ia0b39aae8f6cfa139a81877554c34bb5b8e5cb1a --- doc/source/nodepool.rst | 4 -- hiera/common.yaml | 4 -- inventory/base/hosts.yaml | 44 ------------------- .../templates/docker-compose.yaml.j2 | 1 - 4 files changed, 53 deletions(-) diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index c988d96bea..f7ca1626be 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -12,10 +12,6 @@ At a Glance =========== :Hosts: - * nl01.opendev.org - * nl02.opendev.org - * nl03.opendev.org - * nl04.opendev.org * nl05.opendev.org * nl06.opendev.org * nl07.opendev.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 22b65c40f9..4cff0f9dbe 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -34,10 +34,6 @@ cacti_hosts: - nb05.opendev.org - nb06.opendev.org - nb07.opendev.org -- nl01.opendev.org -- nl02.opendev.org -- nl03.opendev.org -- nl04.opendev.org - nl05.opendev.org - nl06.opendev.org - nl07.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index b299008cba..ba3b710475 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -501,50 +501,6 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCv4t4b/vyQ3G15ewMEAaM5ilNqIp2FyhAc8hnfKiCdXOaFQB1vKn4fboS0MN6haXYDHAhZyLTYdSxlbKdxD8+tl6rYKrw3MuAobp1v42fW3Z+WtLTg4YfK+OycPmhC6dtsx/rUHs2ykhtTxBgTvtI4OxUeT9SCrUqChNFHDN0zxikL6XdC8YoWT5nM+QzBmHqPAQ6IeMqH2DDsYeNjomj3mTdV1M6rh2uNcFmgQ5Sl/uHbeTI0YJfjri7/XVdUI91JwexuRTVBVwDehWJZUM02Asb+2klEws7RW7TJsrLLv2auKOVgrHJho0cua3hdfQRAgE0PCzL3KnQWewb1mJHlGZfiNaw477VU+nFPkE/TGeDbesB+vYPnqiOd0NB5kJsr00M5J+QW3tnlqqnswhF8YdIpbZr1oDBvXPU/CBw1el3rV7AUaAVx1RNdZx3o8z3yu5Yezh2agWMn99OdO8koXiaayMLmw7RxB2dhve6Unhb5A6ONlmdRQJIfzzSjbsU=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKeNhXbXm9V63Y0fmx+ZkYWHkRONzLako4F3UTfrpJH11OmlKthb/Xn4JYi1AKXs9ilaiQlFalzbBnu4Ja/MfkE=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBRX/Dsps3s/7cjYbbCGvwTm3TS9N04KsFm98/uN/Nld' - nl01.opendev.org: - ansible_host: 104.239.144.109 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.239.144.109 - public_v6: 2001:4800:7818:104:be76:4eff:fe04:5041 - host_keys: - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPgd/tto8m+FRMnnfzDIwjbJpUvTPffUxMidSxSdv3+Ow4tL3QJ3XydW4Wj3wpY4G4ItiiGmkSgNz3UQMuUcrXA=' - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDI7fHomtFCvLaIbxxWdZdvY0Wapde39mE0g4bCrh/qUlCw9PnJ/cF8JU8LtF2EfQe/pWs481tNE+Jok4RQO+Mo7rz7EQBAjd3FQ9S+9uCc5IyZoHffrxLT9fATNFor5g1L8wsQ2L53smou+7GF0z3QKaoT+61K4Clm9CDRJaOjbgLxc6BLG6pMZ5ZJ25bfZtKE452E11TuDRmHmQvyvLQOJdP+3hEzJnA7Ju2JVDXKKIx8jPg6BhG98oXSXdrr0/O8S1rDrKGLOW5uTuAQVoP6wXBzlSQJdq6uTcV8DjBf+cud7i010ky77TkYh1qVy3nvGcbJzXDao7dkQrOSU/8X4Zv51h/eDDRoAdDrm8ErKR51Ao2g7OPH2BimRrmCU0UYC7SINAzqHj0q9yoTybBsnkg70OZ9QfTfMTZvFgAOE7Qe3OTpQ3bBp7gYfo6tsa7EMpktqY9xflIPt6dJYOmg7OXkQqwxlhUR1WCGHJZOcYMLCpAjSCMZaFGPmsTVneM=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICYN7bhiLKhG0F4NRzkFO7JoASDTa2OYf0aEZUZbUtgB' - nl02.opendev.org: - ansible_host: 104.239.143.212 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.239.143.212 - public_v6: 2001:4800:7818:104:be76:4eff:fe04:3750 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwBnSWhjFtW03rgWpd9qeSSOpJ2wqT3psedJo3JcNDE+8ysdWnysRbEOfbw44MXYQpOOHBEosAAgU2CdMJyDzP6111wDxJC5u9xESYZZv54aBFqn+Z2r4FkkPv6X503CfuQ/8bf+Ayx8rhHYpRjWI7AzBoBNudI58Vtgj5bzMc/eeIf/RFcoIQakcADn8xoKEHnnF+Uy36H6CSAh6mtBMMHAfN+z+1mRkwJXk9aVvldfZ5LOTaFWh776rgDG5HIiBDupYBT9FwxugxYzVer1DXDt7+QwkoMFS9ThyEmM0rV9edZSvn3vdPaeZty3WKChJ0evJDW2IUw6eik9NJuE1EkofpQ7xk25KyzNyBuoJisdt/oMCDLcDNBX5w7KFQbqY30IocS3+bCcGI5wBLnOs1fWgY8D5qg9OsHpQ6hhYXt6M0zRmYTizZPpqz6/65yfXVEQUxGHFqaQ1uJJJRa009rAQ4hdoUT+m7zRJqpS+qELeix9zmqeTJ6zHg4ph9CJ0=' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIiFbydmH3Ag1MP9X1BktVkEh41XfVOduBtoDCu+ljAAAueymrA0SvpQduDTDq6w6UoB/YBgE69jlTifzK1l4S0=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAN6j4pW+4zgWIxXTiDFKTk86YjZzmDDMvMTrXzC0FJt' - nl03.opendev.org: - ansible_host: 104.239.144.157 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.239.144.157 - public_v6: 2001:4800:7818:104:be76:4eff:fe04:4a30 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7C8XHRJZO6EuPojtfO1t7+GEtyNfWy+PBKbY2WdWtzt6SLoLjgGXDehBUaT4VWcoVpUNACjbrM+KKT9qqJ4ur/Ia7hir/43u8UwXx+fsfpy6568VLOLWiQWDgCX6VttorbL9ApNY716nIjGLwCJ5JDpi5Bv8atecnkwIKfRuoO67anIhrarlUWP24mnmMZSULJz4AS1jrGOXsz1NYMoc+oYjADmRGDCeT7XsF7t9ab22Jj2+3aISpyxYw43ycbKIVSrHAnoYAqQlkl8qDn3ztCiuRqihhCMkoLEAMR3cZ9A6nWAAYeDXM6ltFeorPT+iDfNc/cF3fSqwOSFochYhz7sxDuuuzY6wNzwinOzWyDa46/2L5/S7Zg7BrX1B+E/T3FbUZjukmbljZLGywKEiRqR5sDhocJ9VouMapfAZyR+zSH7B+sZKMvMUOF2jIkkefFTUlRcTJkkHZ66r2EcU3tQFbRPZ3zzsLlwplJZprk171uSjRXNrbkVFpSI68Duk=' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHirGUaeNnxcJw1ArdcFBvkQK8f0tYYOxu8tNNuVB+dRhQG5bKn0WNaDWMZKUSLrXBOHf1jeExokEWD0+UCJ8oM=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIWGmI5B1Sk2WWzrgUI3LyySMFpOsrJaWXUwXqRHCQIW' - nl04.opendev.org: - ansible_host: 104.239.144.166 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.239.144.166 - public_v6: 2001:4800:7818:104:be76:4eff:fe04:4a80 - host_keys: - - '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' nl05.opendev.org: ansible_host: 104.239.143.26 location: diff --git a/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 b/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 index c1caab30b4..3b0a81850e 100644 --- a/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/nodepool-launcher/templates/docker-compose.yaml.j2 @@ -1,4 +1,3 @@ -version: '2' services: nodepool-launcher: image: quay.io/zuul-ci/nodepool-launcher:{{ nodepool_launcher_container_tag|default('latest') }}