From ed61423b6b3c4318e2ade78c753bb56c3edcc822 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 15 Mar 2021 09:47:06 -0700 Subject: [PATCH] Add nl01.opendev.org to our inventory This is a new focal replacement for nl01.openstack.org. We keep nl01.openstack.org in our inventory for now because we want ansible to update the nodepool.yaml configs for these two hosts to coordinate a hand off of responsibilities once we are happy with the new deployment. We also switch the testing hostname to nl04.openstack.org as this will be the last nodepool launcher to be removed. When we swap it out the testing will be updated to use focal hosts. Depends-On: https://review.opendev.org/c/openstack/project-config/+/779863 Change-Id: Ib3ea6586fe0567c1edf6255ee9be50164d35db62 --- doc/source/nodepool.rst | 1 + hiera/common.yaml | 1 + inventory/base/hosts.yaml | 7 +++++++ testinfra/test_nodepool.py | 4 ++-- zuul.d/system-config-run.yaml | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index fe0093989e..373ff6557a 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -12,6 +12,7 @@ At a Glance =========== :Hosts: + * nl01.opendev.org * nl01.openstack.org * nl02.openstack.org * nl03.openstack.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 2bddb47501..8fdb30c899 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -264,6 +264,7 @@ cacti_hosts: - nb01.opendev.org - nb02.opendev.org - nb03.opendev.org +- nl01.opendev.org - nl01.openstack.org - nl02.openstack.org - nl03.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 7a6c4197e8..6e222690c1 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -557,6 +557,13 @@ all: region_name: RegionOne public_v4: 139.178.85.151 public_v6: 2604:1380:4111:3e54:f816:3eff:fecf:7903 + 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 nl01.openstack.org: ansible_host: 23.253.99.61 location: diff --git a/testinfra/test_nodepool.py b/testinfra/test_nodepool.py index 2bf45a00be..974b8e0567 100644 --- a/testinfra/test_nodepool.py +++ b/testinfra/test_nodepool.py @@ -14,7 +14,7 @@ import pytest -testinfra_hosts = ['nl01.openstack.org', 'nb01.opendev.org'] +testinfra_hosts = ['nl04.openstack.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() != 'nl01.openstack.org': + if host.backend.get_hostname() != 'nl04.openstack.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 e8fe02b77d..508a8a0f5a 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -231,7 +231,7 @@ label: ubuntu-bionic - name: zk01.opendev.org label: ubuntu-bionic - - name: nl01.openstack.org + - name: nl04.openstack.org label: ubuntu-xenial - name: nb01.opendev.org label: ubuntu-bionic @@ -240,7 +240,7 @@ - opendev/system-config - openstack/project-config host-vars: - nl01.openstack.org: + nl04.openstack.org: host_copy_output: '/etc/nodepool/nodepool.yaml': logs '/var/log/nodepool/launcher-debug.log': logs