From a42c0b704a28713c1913c55d9257ebcf6ed356a6 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 2 Mar 2021 10:21:59 -0800 Subject: [PATCH] Remove ze01.openstack.org This server has been replaced by ze01.opendev.org running Focal. Lets remove the old ze01.openstack.org from inventory so that we can delete the server. We will follow this up with a rotation of new focal servers being put in place. This also renames the xenial executor in testing to ze12.openstack.org as that will be the last one to be rotated out in production. We will remove it from testing at that point as well. We also remove a completely unused zuul-executor-opendev.yaml group_vars file to avoid confusion. Change-Id: Ida9c9a5a11578d32a6de2434a41b5d3c54fb7e0c --- hiera/common.yaml | 1 - inventory/base/hosts.yaml | 7 ------- inventory/service/group_vars/zuul-executor-opendev.yaml | 3 --- .../files/inventory_plugins/test-fixtures/results.yaml | 2 +- zuul.d/system-config-run.yaml | 4 ++-- 5 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 inventory/service/group_vars/zuul-executor-opendev.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index bf6f8f00ed..3126bc250a 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -303,7 +303,6 @@ cacti_hosts: - translate-dev.openstack.org - wiki.openstack.org - ze01.opendev.org -- ze01.openstack.org - ze02.openstack.org - ze03.openstack.org - ze04.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index bba9f33236..cc205f6f27 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -754,13 +754,6 @@ all: region_name: DFW public_v4: 104.130.126.25 public_v6: 2001:4800:7818:104:be76:4eff:fe04:52c4 - ze01.openstack.org: - ansible_host: 104.239.136.252 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.239.136.252 - public_v6: 2001:4800:7818:104:be76:4eff:fe04:8d26 ze02.openstack.org: ansible_host: 104.239.140.238 location: diff --git a/inventory/service/group_vars/zuul-executor-opendev.yaml b/inventory/service/group_vars/zuul-executor-opendev.yaml deleted file mode 100644 index a775b0272c..0000000000 --- a/inventory/service/group_vars/zuul-executor-opendev.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# NOTE: ubuntu focal has new enough docker, and upstream docker -# does not have focal support yet. -use_upstream_docker: false diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml index 142f8ac2fb..7dc63e478f 100644 --- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml +++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml @@ -51,7 +51,7 @@ results: - zuul - zuul-executor - ze01.openstack.org: + ze12.openstack.org: - afs-client - zuul - zuul-executor diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 7b9eb5cc51..6cd2af0950 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -741,7 +741,7 @@ label: ubuntu-focal - name: ze01.opendev.org label: ubuntu-focal - - name: ze01.openstack.org + - name: ze12.openstack.org label: ubuntu-xenial - name: zuul01.openstack.org label: ubuntu-xenial @@ -766,7 +766,7 @@ '/etc/hosts': logs '/etc/zuul/zuul.conf': logs '/var/log/zuul/executor-debug.log': logs - ze01.openstack.org: + ze12.openstack.org: host_copy_output: '/etc/hosts': logs '/etc/zuul/zuul.conf': logs