From 9f11fc5c75da3ca4c82cb49fe9e4a176b2376906 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 16 Mar 2021 14:10:43 +1100
Subject: [PATCH] Remove references to review-dev
With our increased ability to test in the gate, there's not much use
for review-dev any more. Remove references.
Change-Id: I97e9865e0b655cd157acf9ffa7d067b150e6fc72
---
doc/source/gerrit.rst | 1 -
doc/source/jeepyb.rst | 1 -
hiera/common.yaml | 1 -
inventory/base/hosts.yaml | 7 -------
inventory/service/groups.yaml | 6 ------
.../host_vars/review-dev01.opendev.org.yaml | 15 --------------
.../files/ssl_cert_check/ssldomains | 1 -
playbooks/manage-projects.yaml | 2 +-
.../handlers/main.yaml | 5 -----
playbooks/service-review-dev.yaml | 20 -------------------
.../templates/group_vars/eavesdrop.yaml.j2 | 4 +++-
zuul.d/infra-prod.yaml | 17 ----------------
zuul.d/project.yaml | 2 --
zuul.d/system-config-run.yaml | 4 ----
14 files changed, 4 insertions(+), 82 deletions(-)
delete mode 100644 inventory/service/host_vars/review-dev01.opendev.org.yaml
delete mode 100644 playbooks/service-review-dev.yaml
diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst
index 10154d8a1c..dab3c4ef71 100644
--- a/doc/source/gerrit.rst
+++ b/doc/source/gerrit.rst
@@ -18,7 +18,6 @@ At a Glance
:Hosts:
* https://review.opendev.org
- * https://review-dev.opendev.org
:Ansible:
* :git_file:`playbooks/service-review.yaml`
* :git_file:`playbooks/roles/gerrit`
diff --git a/doc/source/jeepyb.rst b/doc/source/jeepyb.rst
index a56b672678..6ae6b4c363 100644
--- a/doc/source/jeepyb.rst
+++ b/doc/source/jeepyb.rst
@@ -14,7 +14,6 @@ At a Glance
:Hosts:
* http://review.opendev.org
- * http://review-dev.openstack.org
:Puppet:
* https://opendev.org/opendev/puppet-jeepyb
* :git_file:`modules/openstack_project/manifests/review.pp`
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 681a40908d..f44a8c49c7 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -292,7 +292,6 @@ cacti_hosts:
- mirror-update.opendev.org
- mirror-update.openstack.org
- refstack01.openstack.org
-- review-dev01.opendev.org
- review.openstack.org
- static01.opendev.org
- status01.openstack.org
diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml
index bc49154888..bd42d5cda4 100644
--- a/inventory/base/hosts.yaml
+++ b/inventory/base/hosts.yaml
@@ -641,13 +641,6 @@ all:
region_name: DFW
public_v4: 104.239.144.250
public_v6: 2001:4800:7818:104:be76:4eff:fe04:3cee
- review-dev01.opendev.org:
- ansible_host: 23.253.109.153
- location:
- cloud: openstackci-rax
- region_name: DFW
- public_v4: 23.253.109.153
- public_v6: 2001:4800:7819:104:be76:4eff:fe04:8e55
# Temporary host for testing gerrit upgrade
review-test.opendev.org:
ansible_host: 104.130.159.4
diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 4ca2980a44..ba2807a596 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -9,7 +9,6 @@ groups:
afs-db-server:
- afsdb[0-9]*.openstack.org
afs-client:
- - review-dev[0-9]*.open*.org
- mirror[0-9]*.opendev.org
- mirror-update[0-9]*.opendev.org
- ze[0-9]*.open*.org
@@ -21,7 +20,6 @@ groups:
- etherpad[0-9]*.opendev.org
- gitea01.opendev.org
- review[0-9]*.openstack.org
- - review-dev[0-9]*.open*.org
- zuul[0-9]*.open*.org
- refstack01.openstack.org
- kdc03.openstack.org
@@ -59,7 +57,6 @@ groups:
etherpad: etherpad[0-9]*.open*.org
firehose: firehose[0-9]*.open*.org
gerrit:
- - review-dev[0-9]*.open*.org
- review[0-9]*.open*.org
gitea:
- gitea[0-9]*.opendev.org
@@ -98,7 +95,6 @@ groups:
- meetpad[0-9]*.opendev.org
- mirror[0-9]*.opendev.org
- nb[0-9]*.opendev.org
- - review-dev[0-9]*.open*.org
- review[0-9]*.open*.org
- review-test.opendev.org
- static[0-9]*.opendev.org
@@ -197,8 +193,6 @@ groups:
- refstack[0-9]*.openstack.org
registry:
- insecure-ci-registry[0-9]*.opendev.org
- review-dev:
- - review-dev[0-9]*.open*.org
review:
- review[0-9]*.open*.org
- review-test.opendev.org
diff --git a/inventory/service/host_vars/review-dev01.opendev.org.yaml b/inventory/service/host_vars/review-dev01.opendev.org.yaml
deleted file mode 100644
index 40a0814bec..0000000000
--- a/inventory/service/host_vars/review-dev01.opendev.org.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-letsencrypt_certs:
- review-dev01-opendev-org-main:
- - review-dev.opendev.org
- - review-dev01.opendev.org
- - review-dev.openstack.org
-# We have to set the letsencrypt_gid to something that isn't 3000
-# to not conflict with gerrit2's gid
-letsencrypt_gid: 3001
-gerrit_storyboard_url: https://storyboard-dev.openstack.org
-gerrit_vhost_name: review-dev.opendev.org
-gerrit_serverid: eab9c642-ec65-4bed-95be-8ca1b11d212c
-gerrit_redirect_vhost: review-dev.openstack.org
-gerrit_project_creator_user: openstack-dev-project-creator
-gerrit_self_hostkey: '[review-dev.opendev.org]:29418,[review-dev.openstack.org]:29418,[23.253.109.153]:29418,[2001:4800:7819:104:be76:4eff:fe04:8e55]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4J4BJ/C6kl1PcfD5ZdpYIwWXA+vRiB4USncZQHW9+Idtdr4dZRA05RlBAfiTkKKhjarJpt8PQP2hYt8aJL1miZZjp1s05d9mxGVHfoH7Vyg85vhRa7Jg4VZS0cu34R909q23cBcjSNQSyVKP9neOqovoV/DyB8HHEg0kbsOWC3qzdA+6aVdVV7Mtx/0t0MyiTz0xA5ZCRFwF6IuiMPHLNk128qDhjO2UXnrhyP5A7Kl/JHpIWToLKGIorePndFcFyNXlWIhBoQRDcX6FYjPdavjAGlK1S/Jd5DVJ184Z7rEXL682o487c0NQ/lAV4QF3iz0Aw9QRVrUw21xWvfU4R'
-project_config_subdir: dev/
diff --git a/modules/openstack_project/files/ssl_cert_check/ssldomains b/modules/openstack_project/files/ssl_cert_check/ssldomains
index 0669f6402f..90f226f780 100644
--- a/modules/openstack_project/files/ssl_cert_check/ssldomains
+++ b/modules/openstack_project/files/ssl_cert_check/ssldomains
@@ -46,7 +46,6 @@ openstackid.org 443
refstack.openstack.org 443
review.opendev.org 443
review.openstack.org 443
-review-dev.opendev.org 443
security.openstack.org 443
static.openstack.org 443
storyboard.openstack.org 443
diff --git a/playbooks/manage-projects.yaml b/playbooks/manage-projects.yaml
index 558f2cfd21..b84186fc05 100644
--- a/playbooks/manage-projects.yaml
+++ b/playbooks/manage-projects.yaml
@@ -3,7 +3,7 @@
roles:
- gitea-git-repos
-- hosts: "review:review-dev:!review-test.opendev.org:!disabled"
+- hosts: "review:!review-test.opendev.org:!disabled"
name: "Create repos on gerrit servers"
tasks:
- name: Sync project-config
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index abf40c848b..5ca9e4f387 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -134,11 +134,6 @@
- name: letsencrypt updated nb03-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-# review-dev
-
-- name: letsencrypt updated review-dev01-opendev-org-main
- include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
# review
- name: letsencrypt updated review01-opendev-org-main
diff --git a/playbooks/service-review-dev.yaml b/playbooks/service-review-dev.yaml
deleted file mode 100644
index f1b545fbef..0000000000
--- a/playbooks/service-review-dev.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- hosts: "review-dev:!disabled"
- name: "Configure gerrit on review-dev"
- roles:
- - iptables
- - install-docker
- - role: gerrit
- gerrit_ssh_rsa_key_contents: "{{ gerrit_dev_ssh_rsa_key_contents }}"
- gerrit_ssh_rsa_pubkey_contents: "{{ gerrit_dev_ssh_rsa_pubkey_contents }}"
- gerrit_project_ssh_rsa_key_contents: "{{ gerrit_dev_project_ssh_rsa_key_contents }}"
- gerrit_project_ssh_rsa_pubkey_contents: "{{ gerrit_dev_project_ssh_rsa_pubkey_contents }}"
- gerrit_replication_ssh_rsa_key_contents: "{{ gerrit_dev_replication_ssh_rsa_key_contents }}"
- gerrit_replication_ssh_rsa_pubkey_contents: "{{ gerrit_dev_replication_ssh_rsa_pubkey_contents }}"
- gerrit_database_config_section: "{{ gerrit_dev_database_config_section }}"
- gerrit_lp_access_token: "{{ gerrit_dev_lp_access_token }}"
- gerrit_lp_access_secret: "{{ gerrit_dev_lp_access_secret }}"
- gerrit_lp_consumer_key: "{{ gerrit_dev_lp_consumer_key }}"
- gerrit_storyboard_token: "{{ gerrit_dev_storyboard_token }}"
- gerrit_email_private_key: "{{ gerrit_dev_email_private_key }}"
- gerrit_mysql_host: "{{ gerrit_dev_mysql_host }}"
- gerrit_mysql_password: "{{ gerrit_dev_mysql_password }}"
diff --git a/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 b/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
index 08cd3bcfb2..f36681b842 100644
--- a/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
@@ -13,7 +13,9 @@ gerritbot_irc_nick: gerritbottest
gerritbot_irc_password: notarealpassword
gerritbot_irc_server: irc.doesnotexist.com
gerritbot_gerrit_user: gerritbottest
-gerritbot_gerrit_host: review-dev.opendev.org
+# This doens't get logged into; the test just checks
+# if the container starts and fails to connect.
+gerritbot_gerrit_host: review.opendev.org
# This is a real key to make paramiko happy
# but it was generated just for testing.
gerritbot_ssh_key: |
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 9fdd03b1dd..591bdb1a3c 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -386,23 +386,6 @@
- playbooks/roles/iptables/
- playbooks/roles/gerrit/
-- job:
- name: infra-prod-service-review-dev
- parent: infra-prod-service-base
- description: Run service-review-dev.yaml playbook.
- vars:
- playbook_name: service-review-dev.yaml
- dependencies: *infra_prod_service_review_deps
- files:
- - inventory/
- - playbooks/service-review-dev.yaml
- - inventory/service/group_vars/gerrit.yaml
- - inventory/service/host_vars/review-dev01.opendev.org.yaml
- - playbooks/roles/pip3/
- - playbooks/roles/install-docker/
- - playbooks/roles/iptables/
- - playbooks/roles/gerrit/
-
- job:
name: infra-prod-service-refstack
parent: infra-prod-service-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index d2485d2dff..662ddc2a27 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -314,7 +314,6 @@
- infra-prod-service-zuul
- infra-prod-service-zuul-preview
- infra-prod-service-review
- - infra-prod-service-review-dev
- infra-prod-service-gitea
- infra-prod-service-codesearch
- infra-prod-service-eavesdrop
@@ -354,7 +353,6 @@
- infra-prod-service-borg-backup
- infra-prod-service-zookeeper
- infra-prod-service-review
- - infra-prod-service-review-dev
- infra-prod-service-gitea
- infra-prod-service-codesearch
- infra-prod-service-eavesdrop
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index bf17d46777..3a51163064 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -815,7 +815,6 @@
vars:
run_playbooks:
- playbooks/letsencrypt.yaml
- - playbooks/service-review-dev.yaml
- playbooks/service-review.yaml
run_test_playbook: playbooks/test-review.yaml
host-vars:
@@ -831,13 +830,10 @@
- playbooks/service-review.*.yaml
- inventory/service/group_vars/review.yaml
- inventory/service/host_vars/review\d+.openstack.org.yaml
- - inventory/service/group_vars/review-dev.yaml
- - inventory/service/host_vars/review-dev\d+.opendev.org.yaml
- playbooks/roles/pip3/
- playbooks/roles/install-docker/
- playbooks/roles/letsencrypt
- playbooks/roles/gerrit/
- - playbooks/zuul/templates/group_vars/review-dev.yaml.j2
- playbooks/zuul/templates/group_vars/review.yaml.j2
- testinfra/test_gerrit.py
- docker/gerrit/