opendev/system-config
Code Issues Proposed changes

Merge "Replace eavesdrop01 with eavesdrop02"

Browse Source
This commit is contained in:
Zuul
2025-08-01 23:48:28 +00:00
committed by Gerrit Code Review
parent b5fdaad10c 8bf36062ba
commit abefa679f5
11 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/irc.rst
View File

@@ -59,7 +59,7 @@ Service overview
================
The OpenDev team runs Limnoria `Limnoria
<https://github.com/ProgVal/Limnoria>`__ on ``eavesdrop01.opendev.org``
<https://github.com/ProgVal/Limnoria>`__ on ``eavesdrop02.opendev.org``
to provide channel and meeting logs.
Channel logs are provided by Limnoria's inbuilt channel logger.
@@ -246,7 +246,7 @@ room moderators use to surface what's currently happening at the
event. Usage instructions are provided in its `README.rst file
<https://opendev.org/openstack/ptgbot/src/branch/master/README.rst>`_.
Its container serves content from an embedded HTTPd which we proxy on
eavesdrop01.opendev.org locally with a https://ptg.opendev.org/ Apache
eavesdrop02.opendev.org locally with a https://ptg.opendev.org/ Apache
vhost.
Code for the PTG bot lives in the `openstack/ptgbot respository

2
hiera/common.yaml
View File

@@ -14,7 +14,7 @@ cacti_hosts:
- bridge01.opendev.org
- cacti.openstack.org
- codesearch02.opendev.org
- eavesdrop01.opendev.org
- eavesdrop02.opendev.org
- etherpad02.opendev.org
- gitea-lb03.opendev.org
- gitea09.opendev.org

14
inventory/base/hosts.yaml
View File

@@ -132,17 +132,17 @@ all:
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMKUPif2C2NHv4annldTFX2fxJpC//Z01OWeBla6OMAvGRZShGM76D9ENE1TsX5bbTxOA+gCJhFt0aNyWSKnsxc='
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDDBVXobu9YcuE2oJHXnu8LjaU1jKBO9g3euraNiGguC7hlVcXtgTJphx+I8n6LqyuIA3C3RgKGPFwLuNesxGD/JA5n+rkTAxAzo2tdQaUx2cXner/nr232hggxIswOgpwbFk5MoBPX6T8UqTZs1uN2oEa/8OTzBJDpZ6TCSJN8ewo3Ci3QB0Pl4/NQmLNHWIqSBNDm3DHPjgFxOtVqcnX+BoyBLw0IqVfuk2wXxDjSiV2y2hhg1Tfq6UHGIA6f81Ke2mRfEuDQ7Yob64WXyI+UIdXHByEBzQbflGTRR9Vo9iT395rQJVMuOxAO+NjPi8jnji8wB4VdFP++pvGxnfA6zBTFUm0anarqhruA3GRuQus/HNC96nwROo2Mi8seLodc//1SLhFgvLlJzntxZyjU1i+u1RWxFAT8TpZRLcM+5xdH6i/L6FfSfw9cjnBvKpfXCh6Mav3UilWiwc6PtHIEhGPCCaxv9xSmrl/U5/ALEy6YxLtMjzv+VpTxJifEmQs='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNhRF9X8xa5EQ9NvDwZuJ7qpXpOE8lZg7Ks5JAvedSa'
eavesdrop01.opendev.org:
ansible_host: 104.239.144.232
eavesdrop02.opendev.org:
ansible_host: 104.239.145.169
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.239.144.232
public_v6: 2001:4800:7818:104:be76:4eff:fe04:46c8
public_v4: 104.239.145.169
public_v6: 2001:4800:7818:104:be76:4eff:fe04:3ba4
host_keys:
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGme24P3JTYQRRtOVgLXSGG3XDq1XKEYwVJg0W1x6q+cH5XoQkfvm+NstQ+jmc3ICFrkzxBDmuiyfMGv/z6k0SY='
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9c/C8nLwF2YhZF2g4TVAkJeM73fOTA1rTicP6JyxN1c7eWtHj20vuVOhL5AX1iurDwIFxWVyJn9fTmCp1wDyRestw6joKYJSQiMarYH+tbgj8fJZ/5fpWMBcXfNjbZfiGLEN4CX8ZdRsgb6GYPLwK+l0LXkCLuF7gLZtDQlLXZalTMxXVGrhrlGmN0c8zr71ApQw91ymYwIdTO9zOTxXhQZq9GxtVwZqihPXYp0wf4hPmC9LG/j9xhONp4FqbQdhM43xJiNjzYMYyNgBe3B1d6YhMADI0M917De0RYp409svFTtWdyD99XFhP9GKAb94hZJ7T6x+5arKBFMZxodFE8cEDdzXfPCnOgFQQWLKIfa0fHQtnLYzQKORtIH/HwGECNwct2gW+Wt7Wap2HR7esiEGhpjDpPSZtftmGPqiWXLKG9KVCqrj3nL5tqubGF1aoNeGaBeMAMuHL2ytoZdaxLgIj9TChPc6rc4rdd5hXAExgEUWHrq/a+hLWJt+XA48='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7CY+WuTgn6fRtEOJGDNov+DK0XsvTBC6ug/Hna1ise'
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINWWlikobUz1cJrs4zhGsvpeddhmZC4r6xfD2ewfxHVE
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4Wh+cBDg3BVwjwstt2TLQ/NLDIR7m63TjjLehe4uNF1i+LWv5bSzrPH22PUFGLYYwR0Sbmrw5WpatizTCyN2A6p7/2iJwgq5Gsysdc8xjXNXcNa4guoWwH8SRVtFFQ3YbQD2tN34Atrdq0Szv2422HyYI79FNUbnTSzFx6pT8K1hnTmdMIoRneN26S06nRCzr0gfOqZrupMx3TYF0nERZ9y1DlhuIF4ZBaTiplyyDkrh26u5anO3LC4E7yDAzuMJ0yTlhOD0xQR1Pr9AIxUpfJoR/tPtVeKIh5pYsQHobotrLUYE7/MV3StdDO6cMXmmHcasuFYqoy8vHXKd0q943T2PmMvw3xqWCR1ueNvuidnUBthCi1WjhRcDPOt33yz8EanaJljUwJO3e/iyu2mycftlOiHbKjjqPp+yj0Kh82mkNl4v00zPap1WLbVK95e/LVKjUB9WqFtapEahMs5PZ4kROaw+KjD/4OEiI/SHtmwdRbh8Qp+12llQspU1B77c=
- ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKtsNtSU2OWy9259719LDZlJ6mf8Rq4fxTV7iFRXU3rhfSzAZokoTYHd2B9QmoZkni2uBc8FPlN91atpz5Ef37I=
etherpad02.opendev.org:
ansible_host: 104.239.145.42
location:

3
inventory/service/groups.yaml
View File

@@ -28,13 +28,14 @@ groups:
- zuul[0-9]*.opendev.org
- refstack01.openstack.org
- kdc03.openstack.org
- eavesdrop01.opendev.org
- eavesdrop02.opendev.org
- paste02.opendev.org
- lists01.opendev.org
- keycloak03.opendev.org
# These are test specific hosts that we add to the backup
# group to mimic as much as possible what their prod version
# end up doing.
- eavesdrop99.opendev.org
- gitea99.opendev.org
- review99.opendev.org
- lists99.opendev.org

4
inventory/service/host_vars/eavesdrop01.opendev.org.yaml → inventory/service/host_vars/eavesdrop02.opendev.org.yaml
View File

@@ -1,6 +1,6 @@
letsencrypt_certs:
eavesdrop01-opendev-org-main:
- eavesdrop01.opendev.org
eavesdrop02-opendev-org-main:
- eavesdrop02.opendev.org
ptg-opendev-org-main:
- ptg.opendev.org
- ptg.openstack.org

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

@@ -11,7 +11,7 @@
# ("include_tasks" is okay).
# https://docs.ansible.com/ansible/latest/porting_guides/porting_guide_2.8.html#imports-as-handlers
- name: letsencrypt updated eavesdrop01-opendev-org-main
- name: letsencrypt updated eavesdrop02-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated graphite02-main
@@ -241,6 +241,9 @@
- name: letsencrypt updated gitea99-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml
- name: letsencrypt updated eavesdrop99-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated etherpad-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

8
playbooks/roles/static/files/50-meetings.opendev.org.conf
View File

@@ -27,11 +27,11 @@ Define AFS_ROOT /afs/openstack.org/project/meetings.opendev.org
SSLProxyEngine on
ProxyPass "/irclogs" "https://eavesdrop01.opendev.org/irclogs" ttl=120 keepalive=On retry=0
ProxyPassReverse "/irclogs" "https://eavesdrop01.opendev.org/irclogs"
ProxyPass "/irclogs" "https://eavesdrop02.opendev.org/irclogs" ttl=120 keepalive=On retry=0
ProxyPassReverse "/irclogs" "https://eavesdrop02.opendev.org/irclogs"
ProxyPass "/meetings" "https://eavesdrop01.opendev.org/meetings" ttl=120 keepalive=On retry=0
ProxyPassReverse "/meetings" "https://eavesdrop01.opendev.org/meetings"
ProxyPass "/meetings" "https://eavesdrop02.opendev.org/meetings" ttl=120 keepalive=On retry=0
ProxyPassReverse "/meetings" "https://eavesdrop02.opendev.org/meetings"
<Directory ${AFS_ROOT}>
Options Indexes FollowSymLinks MultiViews

1
playbooks/zuul/run-base.yaml
View File

@@ -142,6 +142,7 @@
- group_vars/zuul-scheduler.yaml
- group_vars/zuul-web.yaml
- host_vars/borg-backup01.region.provider.opendev.org.yaml
- host_vars/eavesdrop99.opendev.org.yaml
- host_vars/etherpad99.opendev.org.yaml
- host_vars/letsencrypt01.opendev.org.yaml
- host_vars/letsencrypt02.opendev.org.yaml

7
playbooks/zuul/templates/host_vars/eavesdrop99.opendev.org.yaml.j2 Normal file
View File

@@ -0,0 +1,7 @@
letsencrypt_certs:
eavesdrop99-opendev-org-main:
- eavesdrop99.opendev.org
ptg-opendev-org-main:
- ptg.opendev.org
- ptg.openstack.org
- ptgbot.opendev.org

6
testinfra/test_eavesdrop.py
View File

@@ -13,7 +13,7 @@
# under the License.
testinfra_hosts = ['eavesdrop01.opendev.org']
testinfra_hosts = ['eavesdrop99.opendev.org']
def test_eavesdrop(host):
@@ -37,13 +37,13 @@ def test_gerritbot_logs(host):
def test_gerritbot_running(host):
# Check that the container hasn't stopped
cmd = host.run("docker ps -a")
assert 'gerritbot-docker_gerritbot_1' in cmd.stdout
assert 'gerritbot-docker-gerritbot-1' in cmd.stdout
assert 'Up ' in cmd.stdout
def test_statusbot_running(host):
# Check that the container hasn't stopped
cmd = host.run("docker ps -a")
assert 'statusbot-docker_statusbot_1' in cmd.stdout
assert 'statusbot-docker-statusbot-1' in cmd.stdout
assert 'Up ' in cmd.stdout
def test_ptgbot(host):

6
zuul.d/system-config-run.yaml
View File

@@ -184,8 +184,8 @@
nodeset:
nodes:
- <<: *bridge_node_x86
- name: eavesdrop01.opendev.org
label: ubuntu-focal
- name: eavesdrop99.opendev.org
label: ubuntu-noble
groups:
- <<: *bastion_group
vars:
@@ -193,7 +193,7 @@
- playbooks/letsencrypt.yaml
- playbooks/service-eavesdrop.yaml
host-vars:
eavesdrop01.opendev.org:
eavesdrop99.opendev.org:
host_copy_output:
'/var/lib/limnoria': logs
'/var/log/apache2': logs