Remove review02 from the inventory

This change removes review02 from our inventory and configuration management. This should be landed after we're confident we're unlikely to need to roll back to that server. That said if we do rollback before the server is cleaned up reverting this change isn't too bad. Change-Id: Ica14ae92c4c1ef6db76acef93d6d65977aab4def
2025-04-21 11:07:22 -07:00 · 2025-04-21 11:07:22 -07:00 · 9d6e8ea0a0
commit 9d6e8ea0a0
parent 2b85c5ed13
11 changed files with 38 additions and 63 deletions
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@ -395,7 +395,7 @@ To rename a project:
   ``opendev/project-config`` repository.

 #. An hour in advance of the maintenance (if possible), put
-   ``review02.opendev.org``, ``gitea01-8.opendev.org``, and
+   ``review03.opendev.org``, ``gitea09-14.opendev.org``, and
   ``storyboard01.opendev.org`` into the emergency file on bridge.

 #. Check that all servers involved in the rename playbook
@ -419,7 +419,7 @@ To rename a project:
      our old pre rename state causing the project to be created under
      its old name.

-#. Remove ``review02.opendev.org``, ``gitea01-8.opendev.org``, and
+#. Remove ``review03.opendev.org``, ``gitea09-14.opendev.org``, and
   ``storyboard01.opendev.org`` from the emergency file.

 #. Ensure that the next manage-projects run does not update the giteas
@ -617,9 +617,9 @@ To run ``jstack`` and produce a thread dump do

 .. code-block:: shell-session

-   root@review02 # docker exec -it gerrit-compose_gerrit_1 bash
-   gerrit@review02 $ ps -ef | grep java # find the Gerrit java process PID
-   gerrit@review02 $ jstack ${PID} > /tmp/dump.yearmonthday
+   root@review03 # docker exec -it gerrit-compose_gerrit_1 bash
+   gerrit@review03 $ ps -ef | grep java # find the Gerrit java process PID
+   gerrit@review03 $ jstack ${PID} > /tmp/dump.yearmonthday

 Debugging Failed OpenID Logins
 ------------------------------
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@ -54,7 +54,6 @@ cacti_hosts:
 - mirror-update.opendev.org
 - mirror-update.openstack.org
 - refstack01.openstack.org
- review02.opendev.org
 - review03.opendev.org
 - static02.opendev.org
 - storyboard01.opendev.org
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@ -600,17 +600,6 @@ all:
        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSn4bedF+dxVMa62ivwtrhKAP511EBeXsX9MO4GeORP27A2pUgJpI27aJwtIb+atsSQkIhgJgNzCcWzzEC2hOMMyO5x/KoI30CMSx1OzQHNDOjn0fm72+0RvCxr+z5lxotjC+fv6GqTg0MKjwE2IMDflZ635tHn8tasdt/LeUo+Jm4ulMAgNVuXAsORSQsZXbivO3YnLniZd8Plqv5Xl5yLp5ryYzwhfgsUCq/GxKe/dmd97l9zmMtYM+I0ynbFsInHUfSCiWYTjK0G025CSI9618BkQGUy2g3QEbfNgfxz4oNJTrCg63O9V8qbNerrssio+oP+Oh3W+hJFdFePdSxPLC+DuI9uYeF8MXctrepucYRpeg3NgA5D7EJv3XetjqmjHzljSYhmozvnEjsexlYQF/pXhcpC+/biQpHjJuxbfMqBWnNLCXLrXbe4Izg8nRaMbEeXKEbXITKooTSDHOhyFIxdzBd3S3UIRZs3mO2OFrdHCEkBFYT5LBnoXdL8Fc='
        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOD0NAc1G4XGcZKT+ypYQr2ToFl2WFmScHW2rS53BHGKbDrIQwc4hIRH/32Zh4/8VaXvGz39ShQP0zfuW7bZwjs='
        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHwsecA5HspF+jd2ZD2QkcthuGAc8lmZxRwikUaVVZpk'
-    review02.opendev.org:
-      ansible_host: 199.204.45.33
-      location:
-        cloud: openstackci-vexxhost
-        region_name: ca-ymq-1
-      public_v4: 199.204.45.33
-      public_v6: 2604:e100:1:0:f816:3eff:fe52:22de
-      host_keys:
-        - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEJ/bu8iXsgd35rzPnEBS5Ern4UDBOls1/Lno+lUClm8sSHhzXszUzF1yh+NuQw2kiOG89+2RPB9RIoIu9I2e0g='
-        - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVYaqj3QwrrkxE6DKQ9sXU0W7hrp464JXsESVjcL7e9SgNSHXU3KiDdIhUGk+KFG6ZqMyENe73VqsaW8Yc7aiV5yDORjltxDEXkUIP5fLbslDC4Pjv/IotMvqeI2DGB6ByShMYkFjSIwItG3uDU1oUANSRC/3COsUx9wChCz40K6655D4QjYfeZlWbPNjA2hs7Zp+4cf8E6RWZggetatY1OgvZxvwTbjRXbHWa/qcpiCgUSucdKI4WH/z8iu4y9MkP/J1SdvTHey0ljWRFCBr/XkFk24saePLiwiT3LkXUiSvLclMM2kFG+X5KLBYPN121HrxLtzlFYAtRmx1QK/ggomeSVhygq6VHghsr6NQkXC+/kuo/Lf8wyeXCzntv38li8vKyyL7QQTEgEsdA5UDj9jrqbq3G8gM/RDLoXMcYigHxZaT8iwD2dbTuITlA6U/gCAye4+unHKZakjMHl4vL+M1a2lhkrSlCGhTHJKxLXFN0RGAOjSQJqO8L/7yh0IM='
-        - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMJ2xoJPoTjRK7MGMdLbpEqsrz7W8YRqbxafAJ6ijNU6'
    review03.opendev.org:
      ansible_host: 162.253.55.233
      location:
--- a/inventory/service/group_vars/zuul.yaml
+++ b/inventory/service/group_vars/zuul.yaml
@ -4,7 +4,6 @@ zuul_user: zuuld
 zuul_group: zuuld
 zuul_known_hosts: |
  [review.opendev.org]:29418,[review.openstack.org]:29418 {{ gerrit_ssh_rsa_pubkey_contents }}
-  [review02.opendev.org],[199.204.45.33]:29418,[2604:e100:1:0:f816:3eff:fe52:22de]:29418 {{ gerrit_ssh_rsa_pubkey_contents }}
  [review03.opendev.org],[162.253.55.233]:29418,[2604:e100:1:0:f816:3eff:fe31:926a]:29418 {{ gerrit_ssh_rsa_pubkey_contents }}
  [git.opendaylight.org]:29418,[52.35.122.251]:29418,[2600:1f14:421:f500:7b21:2a58:ab0a:2d17]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyRXyHEw/P1iZr/fFFzbodT5orVV/ftnNRW59Zh9rnSY5Rmbc9aygsZHdtiWBERVVv8atrJSdZool75AglPDDYtPICUGWLR91YBSDcZwReh5S9es1dlQ6fyWTnv9QggSZ98KTQEuE3t/b5SfH0T6tXWmrNydv4J2/mejKRRLU2+oumbeVN1yB+8Uau/3w9/K5F5LgsDDzLkW35djLhPV8r0OfmxV/cAnLl7AaZlaqcJMA+2rGKqM3m3Yu+pQw4pxOfCSpejlAwL6c8tA9naOvBkuJk+hYpg5tDEq2QFGRX5y1F9xQpwpdzZROc5hdGYntM79VMMXTj+95dwVv/8yTsw==
 zuul_connections:
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@ -24,7 +24,6 @@ groups:
  borg-backup:
    - etherpad[0-9]*.opendev.org
    - gitea09.opendev.org
-    - review02.opendev.org
    - review03.opendev.org
    - zuul[0-9]*.opendev.org
    - refstack01.openstack.org
--- a/inventory/service/host_vars/review02.opendev.org.yaml
+++ b/inventory/service/host_vars/review02.opendev.org.yaml
@ -1,8 +0,0 @@
-gerrit_replication: []
-gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543
-gerrit_heap_limit: 96g
-letsencrypt_certs:
-  review02-opendev-org-main:
-    - review.opendev.org
-    - review02.opendev.org
-    - review.openstack.org
--- a/playbooks/roles/gerrit/tasks/backup.yaml
+++ b/playbooks/roles/gerrit/tasks/backup.yaml
@ -10,7 +10,7 @@
 #
 #  # borg-mount <backup-server>
 # the dump file will be under
-#  /opt/backups/review02-mariadb-<date>T<time>/mariadb
+#  /opt/backups/review03-mariadb-<date>T<time>/mariadb
 - name: Create mariadb streaming file to setup mariadb backup jobs
  copy:
    content: >-
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@ -28,7 +28,7 @@ results:
    - letsencrypt
    - mirror

-  review02.opendev.org:
+  review03.opendev.org:
    - borg-backup
    - letsencrypt
    - review
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@ -176,9 +176,6 @@

 # review

- name: letsencrypt updated review02-opendev-org-main
-  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
 - name: letsencrypt updated review03-opendev-org-main
  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

--- a/playbooks/service-review.yaml
+++ b/playbooks/service-review.yaml
@ -11,33 +11,34 @@
 #  http://lists.opendev.org/pipermail/service-discuss/2021-April/000200.html
 #  https://launchpad.net/bugs/1844712
 # We do not want this to be created when we are testing gerrit.
- hosts: "review02.opendev.org"
-  tasks:
-    - name: Install RA rejection
-      when: gerrit_under_test is not defined or not gerrit_under_test
-      copy:
-        dest: '/etc/netplan/50-cloud-init.yaml'
-        owner: 'root'
-        group: 'root'
-        mode: '0644'
-        content: |
-          network:
-            version: 2
-            ethernets:
-              ens3:
-                dhcp4: true
-                dhcp6: false
-                accept-ra: false
-                addresses:
-                  - '2604:e100:1:0:f816:3eff:fe52:22de/64'
-                routes:
-                  - to: '::/0'
-                    via: '2604:e100:1:0::1'
-                    metric: 100
-                  - to: '::/0'
-                    via: '2604:e100:1:0::2'
-                    metric: 100
-                match:
-                    macaddress: fa:16:3e:52:22:de
-                mtu: 1500
-                set-name: ens3
+# TODO(clarkb) determine if we should write out a similar file for review03.
+#- hosts: "review02.opendev.org"
+#  tasks:
+#    - name: Install RA rejection
+#      when: gerrit_under_test is not defined or not gerrit_under_test
+#      copy:
+#        dest: '/etc/netplan/50-cloud-init.yaml'
+#        owner: 'root'
+#        group: 'root'
+#        mode: '0644'
+#        content: |
+#          network:
+#            version: 2
+#            ethernets:
+#              ens3:
+#                dhcp4: true
+#                dhcp6: false
+#                accept-ra: false
+#                addresses:
+#                  - '2604:e100:1:0:f816:3eff:fe52:22de/64'
+#                routes:
+#                  - to: '::/0'
+#                    via: '2604:e100:1:0::1'
+#                    metric: 100
+#                  - to: '::/0'
+#                    via: '2604:e100:1:0::2'
+#                    metric: 100
+#                match:
+#                    macaddress: fa:16:3e:52:22:de
+#                mtu: 1500
+#                set-name: ens3
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@ -463,7 +463,6 @@
      - inventory/base
      - playbooks/service-review.yaml
      - inventory/service/group_vars/review.yaml
-      - inventory/service/host_vars/review02.opendev.org.yaml
      - inventory/service/host_vars/review03.opendev.org.yaml
      - playbooks/roles/pip3/
      - playbooks/roles/install-docker/