opendev/system-config
Code Issues Proposed changes

Add nl01.opendev.org to our inventory

Browse Source 
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
This commit is contained in:
Clark Boylan 2021-03-15 09:47:06 -07:00
parent 40471d7ec0
commit ed61423b6b
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/nodepool.rst
View File

@ -12,6 +12,7 @@ At a Glance
=========== ===========
:Hosts: :Hosts:
* nl01.opendev.org
* nl01.openstack.org * nl01.openstack.org
* nl02.openstack.org * nl02.openstack.org
* nl03.openstack.org * nl03.openstack.org

1
hiera/common.yaml
View File

@ -264,6 +264,7 @@ cacti_hosts:
- nb01.opendev.org - nb01.opendev.org
- nb02.opendev.org - nb02.opendev.org
- nb03.opendev.org - nb03.opendev.org
- nl01.opendev.org
- nl01.openstack.org - nl01.openstack.org
- nl02.openstack.org - nl02.openstack.org
- nl03.openstack.org - nl03.openstack.org

7
inventory/base/hosts.yaml
View File

@ -557,6 +557,13 @@ all:
region_name: RegionOne region_name: RegionOne
public_v4: 139.178.85.151 public_v4: 139.178.85.151
public_v6: 2604:1380:4111:3e54:f816:3eff:fecf:7903 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: nl01.openstack.org:
ansible_host: 23.253.99.61 ansible_host: 23.253.99.61
location: location:

4
testinfra/test_nodepool.py
View File

@ -14,7 +14,7 @@
import pytest import pytest
testinfra_hosts = ['nl01.openstack.org', 'nb01.opendev.org'] testinfra_hosts = ['nl04.openstack.org', 'nb01.opendev.org']
def test_clouds_yaml(host): def test_clouds_yaml(host):
@ -33,7 +33,7 @@ def test_kube_config(host):
assert b'nodepool_k8s_key' in kubeconfig.content assert b'nodepool_k8s_key' in kubeconfig.content
def test_launcher_container_running(host): def test_launcher_container_running(host):
if host.backend.get_hostname() != 'nl01.openstack.org': if host.backend.get_hostname() != 'nl04.openstack.org':
pytest.skip() pytest.skip()
cmd = host.run("docker ps -a --format '{{ .Names }}'") cmd = host.run("docker ps -a --format '{{ .Names }}'")

4
zuul.d/system-config-run.yaml
View File

@ -231,7 +231,7 @@
label: ubuntu-bionic label: ubuntu-bionic
- name: zk01.opendev.org - name: zk01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: nl01.openstack.org - name: nl04.openstack.org
label: ubuntu-xenial label: ubuntu-xenial
- name: nb01.opendev.org - name: nb01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
@ -240,7 +240,7 @@
- opendev/system-config - opendev/system-config
- openstack/project-config - openstack/project-config
host-vars: host-vars:
nl01.openstack.org: nl04.openstack.org:
host_copy_output: host_copy_output:
'/etc/nodepool/nodepool.yaml': logs '/etc/nodepool/nodepool.yaml': logs
'/var/log/nodepool/launcher-debug.log': logs '/var/log/nodepool/launcher-debug.log': logs