From 680ed17ecd3de77580cf48e1e05e8c436b34181a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 16 Mar 2021 15:21:58 -0700 Subject: [PATCH] Add new opendev.org nodepool launchers This adds the new focal nodepool launchers replacements for nl02-04 to our inventory. This will configure them with an idle configuration. We then confirm they are happy running in an idle state then switch over the config from the old to new servers. Depends-On: https://review.opendev.org/c/openstack/project-config/+/780982 Change-Id: Iea645925caaeee6f498aa690c4f2c848f6899317 --- doc/source/nodepool.rst | 3 +++ hiera/common.yaml | 3 +++ inventory/base/hosts.yaml | 21 +++++++++++++++++++++ testinfra/test_nodepool.py | 4 ++-- zuul.d/system-config-run.yaml | 6 +++--- 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index 3544d52994..85088eb104 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -13,6 +13,9 @@ At a Glance :Hosts: * nl01.opendev.org + * nl02.opendev.org + * nl03.opendev.org + * nl04.opendev.org * nl02.openstack.org * nl03.openstack.org * nl04.openstack.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 8abb8c23c1..24ae6aa204 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -265,6 +265,9 @@ cacti_hosts: - nb02.opendev.org - nb03.opendev.org - nl01.opendev.org +- nl02.opendev.org +- nl03.opendev.org +- nl04.opendev.org - nl02.openstack.org - nl03.openstack.org - nl04.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 67d3a073b1..ee01dc4fec 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -564,6 +564,27 @@ all: region_name: DFW public_v4: 104.239.144.109 public_v6: 2001:4800:7818:104:be76:4eff:fe04:5041 + 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 + 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 + 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 nl02.openstack.org: ansible_host: 23.253.253.145 location: diff --git a/testinfra/test_nodepool.py b/testinfra/test_nodepool.py index 974b8e0567..74b754967e 100644 --- a/testinfra/test_nodepool.py +++ b/testinfra/test_nodepool.py @@ -14,7 +14,7 @@ import pytest -testinfra_hosts = ['nl04.openstack.org', 'nb01.opendev.org'] +testinfra_hosts = ['nl01.opendev.org', 'nb01.opendev.org'] def test_clouds_yaml(host): @@ -33,7 +33,7 @@ def test_kube_config(host): assert b'nodepool_k8s_key' in kubeconfig.content def test_launcher_container_running(host): - if host.backend.get_hostname() != 'nl04.openstack.org': + if host.backend.get_hostname() != 'nl01.opendev.org': pytest.skip() cmd = host.run("docker ps -a --format '{{ .Names }}'") diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 508a8a0f5a..2ae13e9011 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -231,8 +231,8 @@ label: ubuntu-bionic - name: zk01.opendev.org label: ubuntu-bionic - - name: nl04.openstack.org - label: ubuntu-xenial + - name: nl01.opendev.org + label: ubuntu-focal - name: nb01.opendev.org label: ubuntu-bionic required-projects: @@ -240,7 +240,7 @@ - opendev/system-config - openstack/project-config host-vars: - nl04.openstack.org: + nl01.opendev.org: host_copy_output: '/etc/nodepool/nodepool.yaml': logs '/var/log/nodepool/launcher-debug.log': logs