From d47c217d17e19e7036b3be56ad78933156127bd0 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 8 Apr 2025 08:03:26 -0700 Subject: [PATCH] Add new Noble review03 to the inventory This is a new Gerrit server that will replace the old review02 server. We add it to the review-staging group so that manage-projects ignores it for now. We also give it an empty replication config so that it will not try to force push repo content to the gitea farm. This change does not enable any gerrit init, gerrit reindexing, or even docker compose up the service on the server. That means after it lands and we're convinced it isn't creating any problems for review02 we will manually need to sync content from review02 and then manually bring this server up (which may require an init depending on how much content we copy). Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/946711 Change-Id: Iadf0ed75539c7673544bd8d856e0a3832a5541c2 --- inventory/base/hosts.yaml | 11 +++++++++++ inventory/service/groups.yaml | 4 +++- inventory/service/host_vars/review03.opendev.org.yaml | 10 ++++++++++ .../roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++ zuul.d/system-config-run.yaml | 2 +- 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 inventory/service/host_vars/review03.opendev.org.yaml diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 59e8fab691..564eb7dce5 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -611,6 +611,17 @@ all: - '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: + cloud: openstackci-vexxhost + region_name: ca-ymq-1 + public_v4: 162.253.55.233 + public_v6: 2604:e100:1:0:f816:3eff:fe31:926a + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCamEwPu4ks1UJiIiryrXSmk06qDSTAKNiRrarriI+DPi+feI8P0awOMJ2fy+NRIDaI75IA0FEIr4ME0DnCsQMsreIYmBJVf2SeDu5YkIC8GGP4BVUwHeXBCzBUMEQRwxcSEpqn9HkNJ7lddjStuIE/p9DpgXucjZunbD56pxw42D5GQalEM6ERJklM1eRyUq0d9ql6xghF0efOi6xhRhMt76yX3HQU4suktzhJJf6fgoJlMbPfdit1GCXKJZP9vTz2UK6GSV+96b86IuSYtAuTGjhz8DL/3zRnN+h01ZMn4GiILo9xITH/4etb/qY4vKksPtyqCeFc9KVuyZzZ5CGj4F9VdPNvrHtskT61PUmQ4cOFPEP9S5wgiSLlsMRpIsjBiCu4HKiHY06xmlQtK44kwQHqHSlPEFZy76IbGdkjlukXIk0MhSLUlftseby/ta/zSCNWC+j4nH8v6KmUsMSA7BU9S4jzA+9QyTywMgGzRGV+lvFiWfwM/X5m+2FY9+k=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCxksHbi8OxLyWEIih73zLgH0wOBzisZY3h3OEw8W/hYicgVFn4Slr7gNhzEBMDOCXjvwsoLUSzkLCuHIS83JWs=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE+7UYQaqZINdBhRgNi5yQ6j3OjoWN3qD0FjNO9Z7sDD' static02.opendev.org: ansible_host: 104.130.253.131 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index 4ce0907f1e..0a9646f62e 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -25,6 +25,7 @@ groups: - etherpad[0-9]*.opendev.org - gitea09.opendev.org - review02.opendev.org + - review03.opendev.org - zuul[0-9]*.opendev.org - refstack01.openstack.org - kdc03.openstack.org @@ -146,7 +147,8 @@ groups: - review[0-9]*.opendev.org # This group disables operations like project-managment and # replication. It is intended for staging new production servers. - #review-staging: + review-staging: + - review03.opendev.org static: - static[0-9]*.opendev.org storyboard: diff --git a/inventory/service/host_vars/review03.opendev.org.yaml b/inventory/service/host_vars/review03.opendev.org.yaml new file mode 100644 index 0000000000..eef06d6ebb --- /dev/null +++ b/inventory/service/host_vars/review03.opendev.org.yaml @@ -0,0 +1,10 @@ +# Do not add replication config to the server until we are ready to +# put it into production. +gerrit_replication: [] +gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543 +gerrit_heap_limit: 96g +letsencrypt_certs: + review03-opendev-org-main: + - review.opendev.org + - review03.opendev.org + - review.openstack.org diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index e57db28ec5..c76b648a44 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -179,6 +179,9 @@ - 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 + # refstack - name: letsencrypt updated refstack01-openstack-org-main diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 97b78ccd3e..594237d185 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1067,7 +1067,7 @@ nodes: - <<: *bridge_node_x86 - name: review99.opendev.org - label: ubuntu-focal + label: ubuntu-noble groups: - <<: *bastion_group required-projects: