Merge "Add new opendev.org nodepool launchers"

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

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

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:

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 }}'")

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