Browse Source

Merge "Remove review-test"

changes/22/802922/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
3ce9e4b5ed
  1. 8
      inventory/base/hosts.yaml
  2. 4
      inventory/service/groups.yaml
  3. 14
      inventory/service/host_vars/review-test.opendev.org.yaml
  4. 5
      playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
  5. 23
      playbooks/sync-to-review-test.yaml

8
inventory/base/hosts.yaml

@ -625,14 +625,6 @@ all:
region_name: DFW
public_v4: 104.239.144.250
public_v6: 2001:4800:7818:104:be76:4eff:fe04:3cee
# Temporary host for testing gerrit upgrade
review-test.opendev.org:
ansible_host: 104.130.159.4
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.159.4
public_v6: 2001:4800:7818:102:be76:4eff:fe04:3a2e
review02.opendev.org:
ansible_host: 199.204.45.33
location:

4
inventory/service/groups.yaml

@ -98,7 +98,6 @@ groups:
- paste[0-9]*.opendev.org
- refstack[0-9]*.openstack.org
- review[0-9]*.opendev.org
- review-test.opendev.org
- static[0-9]*.opendev.org
- storyboard[0-9]*.opendev.org
- translate[0-9]*.open*.org
@ -175,8 +174,7 @@ 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-test.opendev.org
#review-staging:
static:
- static[0-9]*.opendev.org
status:

14
inventory/service/host_vars/review-test.opendev.org.yaml

@ -1,14 +0,0 @@
gerrit_replication: []
gerrit_storyboard_url: https://storyboard.openstack.org
gerrit_vhost_name: review-test.opendev.org
gerrit_serverid: adf32efa-43c9-4163-b047-c4449d8997da
gerrit_heap_limit: 48g
gerrit_track_upstream: false
letsencrypt_certs:
review-test-opendev-org-main:
- review-test.opendev.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

5
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml

@ -163,11 +163,6 @@
- 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
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
# refstack
- name: letsencrypt updated refstack01-openstack-org-main

23
playbooks/sync-to-review-test.yaml

@ -1,23 +0,0 @@
- hosts: review-test.opendev.org
tasks:
- name: Stop gerrit
shell:
cmd: docker-compose down
chdir: /etc/gerrit-compose
- hosts: review02.opendev.org
tasks:
- name: Sync the git repos
shell:
cmd: rsync -avz --delete index cache git gerrit2@review-test.opendev.org:/home/gerrit2/review_site
chdir: /home/gerrit2/review_site
- hosts: review-test.opendev.org
tasks:
- name: Start gerrit
shell:
cmd: docker-compose up -d
chdir: /etc/gerrit-compose
Loading…
Cancel
Save