From de4c369c27d4503e163dfccc1c9aa919aab087c1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 23 Feb 2021 10:56:02 -0800 Subject: [PATCH] Replace all the zuul mergers with new focal nodes These servers are all up and running and should be ready to go after the zm01 canary. Note there will be a followup change to remove zm02-zm08.openstack.org from the inventory. We split this up so that we can keep those servers around until we're happy with the replacements. Change-Id: Ic2671da104df2b01986d1b65c8d13507d6792c40 --- hiera/common.yaml | 16 +++++------ inventory/base/hosts.yaml | 50 ++++++++++++++++++++++++++++++++--- zuul.d/system-config-run.yaml | 6 ++--- 3 files changed, 57 insertions(+), 15 deletions(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index 59771ad941..0fa848dafb 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -316,14 +316,14 @@ cacti_hosts: - zk01.openstack.org - zk02.openstack.org - zk03.openstack.org -- zm01.openstack.org -- zm02.openstack.org -- zm03.openstack.org -- zm04.openstack.org -- zm05.openstack.org -- zm06.openstack.org -- zm07.openstack.org -- zm08.openstack.org +- zm01.opendev.org +- zm02.opendev.org +- zm03.opendev.org +- zm04.opendev.org +- zm05.opendev.org +- zm06.opendev.org +- zm07.opendev.org +- zm08.opendev.org - zuul01.openstack.org statusbot_auth_nicks: - jeblair diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 634ef53c49..084cf4d553 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -852,13 +852,55 @@ all: region_name: DFW public_v4: 104.239.144.206 public_v6: 2001:4800:7818:104:be76:4eff:fe04:3a77 - zm01.openstack.org: - ansible_host: 104.239.146.48 + zm02.opendev.org: + ansible_host: 104.239.144.128 location: cloud: openstackci-rax region_name: DFW - public_v4: 104.239.146.48 - public_v6: 2001:4800:7819:104:be76:4eff:fe04:8f22 + public_v4: 104.239.144.128 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:552b + zm03.opendev.org: + ansible_host: 104.239.144.165 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.239.144.165 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:5d4f + zm04.opendev.org: + ansible_host: 104.130.126.63 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.130.126.63 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:5d7d + zm05.opendev.org: + ansible_host: 104.130.126.30 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.130.126.30 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:5ad0 + zm06.opendev.org: + ansible_host: 104.130.126.39 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.130.126.39 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:5eec + zm07.opendev.org: + ansible_host: 104.239.144.235 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.239.144.235 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:4edd + zm08.opendev.org: + ansible_host: 104.130.126.45 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.130.126.45 + public_v6: 2001:4800:7818:104:be76:4eff:fe04:6180 zm02.openstack.org: ansible_host: 23.253.111.79 location: diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index a8dc701dfe..7b9eb5cc51 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -737,8 +737,8 @@ label: ubuntu-bionic - name: zk01.opendev.org label: ubuntu-bionic - - name: zm01.openstack.org - label: ubuntu-xenial + - name: zm01.opendev.org + label: ubuntu-focal - name: ze01.opendev.org label: ubuntu-focal - name: ze01.openstack.org @@ -756,7 +756,7 @@ # Test our ad hoc restart playbook works - playbooks/zuul_restart.yaml host-vars: - zm01.openstack.org: + zm01.opendev.org: host_copy_output: '/etc/hosts': logs '/etc/zuul/zuul.conf': logs