Remove review01 references

This server is no longer in production, so remove the various
references to it.

Change-Id: I2cdd8052c48713e9ba648be20ccad5069d5fe40e
This commit is contained in:
Ian Wienand 2021-07-20 11:57:10 +10:00
parent cf7c95acb1
commit e79e3a2f04
7 changed files with 3 additions and 110 deletions

View File

@ -404,7 +404,7 @@ To rename a project:
``opendev/project-config`` repository.
#. An hour in advance of the maintenance (if possible), put
``review01.opendev.org`` into the emergency file on bridge.
``review02.opendev.org`` into the emergency file on bridge.
#. Run the ansible rename repos playbook, passing in the path to your yaml
file::
@ -416,7 +416,7 @@ To rename a project:
#. Rename the project or transfer ownership in GitHub
#. Remove ``review01.opendev.org`` from the emergency file.
#. Remove ``review02.opendev.org`` from the emergency file.
.. warning::
Wait for the ``project-config`` changes to merge before

View File

@ -633,13 +633,6 @@ all:
region_name: DFW
public_v4: 104.130.159.4
public_v6: 2001:4800:7818:102:be76:4eff:fe04:3a2e
review01.openstack.org:
ansible_host: 104.130.246.32
location:
cloud: openstackci-rax
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:

View File

@ -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 }}
[review01.opendev.org],[104.130.246.32]:29418,[2001:4800:7819:103:be76:4eff:fe04:9229]: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 }}
[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==
gearman_server: zuul02.opendev.org

View File

@ -1,81 +0,0 @@
gerrit_replication:
- name: 'gitea01'
url: 'ssh://git@gitea01.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea02'
url: 'ssh://git@gitea02.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea03'
url: 'ssh://git@gitea03.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea04'
url: 'ssh://git@gitea04.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea05'
url: 'ssh://git@gitea05.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea06'
url: 'ssh://git@gitea06.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea07'
url: 'ssh://git@gitea07.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
- name: 'gitea08'
url: 'ssh://git@gitea08.opendev.org:222/'
authGroup: 'Anonymous Users'
replicationDelay: '1'
replicatePermissions: false
mirror: true
threads: '4'
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_reviewdb_database_type: "{{ gerrit_reviewdb_database_override | default('mysql') }}"
letsencrypt_certs:
review01-opendev-org-main:
- review.opendev.org
- review01.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
gerrit_self_hostkey: '[review.opendev.org]:29418,[review.openstack.org]:29418,[104.130.246.32]:29418,[2001:4800:7819:103:be76:4eff:fe04:9229]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH'
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/*

View File

@ -160,9 +160,6 @@
# review
- 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

View File

@ -6,14 +6,9 @@
cmd: docker-compose down
chdir: /etc/gerrit-compose
- hosts: review01.openstack.org
- hosts: review02.opendev.org
tasks:
- name: Copy the mysqldump
shell:
cmd: scp mysql_backups/gerrit.sql.gz.1 gerrit2@review-test.opendev.org:/home/gerrit2/gerrit.sql.gz
chdir: /home/gerrit2
- name: Sync the git repos
shell:
cmd: rsync -avz --delete index cache git gerrit2@review-test.opendev.org:/home/gerrit2/review_site
@ -22,10 +17,6 @@
- hosts: review-test.opendev.org
tasks:
- name: Apply mysql dump
shell:
cmd: zcat /home/gerrit2/gerrit.sql.gz | mysql --defaults-file=/root/.gerrit_db.cnf
- name: Start gerrit
shell:
cmd: docker-compose up -d

View File

@ -84,12 +84,6 @@ gerrit_replication_ssh_rsa_key_contents: |
edHQJDKx5PktPWsAAAAgbW9yZHJlZEBNb250eXMtTWFjQm9vay1BaXIubG9jYWwBAgM=
-----END OPENSSH PRIVATE KEY-----
gerrit_replication_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQhZQ0z+RVPmOzY2f56N9/PrqDeHftvnagPJyOOXnCd/9N0j+stFWNmavvb8y4dRZ+y6lOJpzPYEahwUUXZHAanz5l5as+VihWq7ldcMxSPnmkC9zr65Z8eNDcM2Bzk8gx5e4DE6OgpWkc6ke9MpwI5dmfW7o53gQZkdSc94TuLr+ZCYUKo7fScsVeE+F9dT0PLyW0zU7c23PzYnkKcrB9ihpQfSfbJj9EAtsA3aA8ZdHt78i5r7+0u0JZxaWoKjkCfYqC8ofbTU61YuUO8TTgNgMC6ZzBmTRdRRRKdGun+m1fqtgIqPSi+iZpKnERgg/hPwY+gqcKh+svW6pgCDhJ gerrit-code-review-replication
# NOTE(ianw) : review01.openstack.org uses mysql in production but
# mariadb for testing in the gate. While the Zuul test still refers
# to review01.openstack.org we use this to override and test mariadb
# in the gate. This override can go away when we retire
# review01.openstack.org.
gerrit_reviewdb_database_override: 'mariadb_container'
gerrit_reviewdb_database_type: mariadb_container
gerrit_reviewdb_mariadb_password: password
gerrit_run_compose_up: true