From 525d5d1c19a3b66b17710c671fa6d616b1fc2de7 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 26 Mar 2021 14:51:20 +1100 Subject: [PATCH] Add review02.opendev.org review02.opendev.org is a much larger replacement server for review01 provided by Vexxhost. It is up and running, with gerrit2 volume attached and DNS entries. This adds it to the staging group with no replication and a local h2 database configured for initial bringup. There's quite a bit to consider for full migration, but this will let us start experimenting. Change-Id: I3638a5c0c7028dcc800ada42431b75395cff0c42 --- inventory/base/hosts.yaml | 7 ++++++ inventory/service/groups.yaml | 1 + .../host_vars/review02.opendev.org.yaml | 24 +++++++++++++++++++ .../handlers/main.yaml | 3 +++ 4 files changed, 35 insertions(+) create mode 100644 inventory/service/host_vars/review02.opendev.org.yaml diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index bd42d5cda4..ea21b5fc75 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -656,6 +656,13 @@ all: region_name: DFW public_v4: 104.130.246.32 public_v6: 2001:4800:7819:103:be76:4eff:fe04:9229 + 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 static01.opendev.org: ansible_host: 23.253.245.150 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index a783ba0534..a0c4108a04 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -199,6 +199,7 @@ groups: # replication. It is intended for staging new production servers. review-staging: - review-test.opendev.org + - review02.opendev.org static: - static[0-9]*.opendev.org status: diff --git a/inventory/service/host_vars/review02.opendev.org.yaml b/inventory/service/host_vars/review02.opendev.org.yaml new file mode 100644 index 0000000000..f73c9158d8 --- /dev/null +++ b/inventory/service/host_vars/review02.opendev.org.yaml @@ -0,0 +1,24 @@ +gerrit_replication: [] +gerrit_storyboard_url: https://storyboard.openstack.org +gerrit_vhost_name: review.opendev.org +gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543 +gerrit_redirect_vhost: review.openstack.org +gerrit_heap_limit: 48g +gerrit_database_type: h2 +letsencrypt_certs: + review02-opendev-org-main: + - review.opendev.org + - review02.opendev.org + - review.openstack.org +# We have to set the letsencrypt_gid to something that isn't 3000 +# to not conflict with gerrit2's gid. +# Also, on review01.openstack.org, 3001 is openstackwatch and +# 3002 is github. +letsencrypt_gid: 3003 +borg_backup_excludes_extra: + - /home/gerrit2/.launchpadlib/cache/* + - /home/gerrit2/review_site/cache/* + - /home/gerrit2/review_site/tmp/* + - /home/gerrit2/review_site/index/* + # dump directly via stream + - /home/gerrit2/mysql_backups/* diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 5ca9e4f387..46d314e986 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -139,6 +139,9 @@ - name: letsencrypt updated review01-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml +- name: letsencrypt updated review02-opendev-org-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml + # review-test - name: letsencrypt updated review-test-opendev-org-main