opendev/system-config
Code Issues Proposed changes

Test port 9001 on eavesdrop

Browse Source 
We merged change I9459e47ecfd19b27b7adcaee9ce91f80d51c124d which
should have opened this port but did not.  Add testing for it.

Remove eavesdrop from webservers group

This was overridding the custom iptables ports that were being set
in the eavesdrop group vars file.  There appears to be no other use
for the webservers group.

Change-Id: I7109f1472176ff39482f9bdfc8462e5f525f791c
This commit is contained in:
James E. Blair 2021-08-11 07:27:55 -07:00
parent 2927d6f59f
commit 8d76a7cd99
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory/service/group_vars/eavesdrop.yaml
View File

@ -1,5 +1,6 @@
iptables_extra_public_tcp_ports: iptables_extra_public_tcp_ports:
- 80 - 80
- 443
- 9001 # When changing this number, also update the default in playbooks/roles/matrix-gerritbot/defaults/main.yaml - 9001 # When changing this number, also update the default in playbooks/roles/matrix-gerritbot/defaults/main.yaml
zuul_user_authorized_key: | zuul_user_authorized_key: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcXd/QJDEprSLh6N6bULnhchf9M+uzYBEJ2b51Au67FON+5M6VEj5Ut+DlkEPhabOP+tSv9Cn1HpmpBjdEOXdmBj6JS7G/gBb4w28oZDyNjrPT2ebpRw/XnVEkGfikR2J+j3o7CV+ybhLDalXm2TUDReVXnONUq3YzZbjRzoYs0xxrxyss47vZP0xFpsAt9jCMAJW2k6H589VUY38k9LFyhZUZ72FB6eJ68B9GN0TimBYm2DqvupBGQrRhkP8OZ0WoBV8PulKXaHVFdmfBNHB7E7FLlZKuiM6nkV4bOWMGOB/TF++wXBK86t9po3pWCM7+kr72xGRTE+6LuZ2z1K+h zuul-system-config-20180924 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcXd/QJDEprSLh6N6bULnhchf9M+uzYBEJ2b51Au67FON+5M6VEj5Ut+DlkEPhabOP+tSv9Cn1HpmpBjdEOXdmBj6JS7G/gBb4w28oZDyNjrPT2ebpRw/XnVEkGfikR2J+j3o7CV+ybhLDalXm2TUDReVXnONUq3YzZbjRzoYs0xxrxyss47vZP0xFpsAt9jCMAJW2k6H589VUY38k9LFyhZUZ72FB6eJ68B9GN0TimBYm2DqvupBGQrRhkP8OZ0WoBV8PulKXaHVFdmfBNHB7E7FLlZKuiM6nkV4bOWMGOB/TF++wXBK86t9po3pWCM7+kr72xGRTE+6LuZ2z1K+h zuul-system-config-20180924

2
inventory/service/groups.yaml
View File

@ -192,7 +192,7 @@ groups:
webservers: webservers:
- cacti[0-9]*.open*.org - cacti[0-9]*.open*.org
- codesearch[0-9]*.opendev.org - codesearch[0-9]*.opendev.org
- eavesdrop[0-9]*.open*.org # eavesdrop has its own group with custom ports
- ethercalc[0-9]*.open*.org - ethercalc[0-9]*.open*.org
- etherpad[0-9]*.open*.org - etherpad[0-9]*.open*.org
- grafana[0-9]*.opendev.org - grafana[0-9]*.opendev.org

3
testinfra/test_eavesdrop.py
View File

@ -23,6 +23,9 @@ def test_eavesdrop(host):
web = ('-A openstack-INPUT -p tcp -m state --state NEW' web = ('-A openstack-INPUT -p tcp -m state --state NEW'
' -m tcp --dport 80 -j ACCEPT') ' -m tcp --dport 80 -j ACCEPT')
assert web in rules assert web in rules
gerritbot_matrix_prom = ('-A openstack-INPUT -p tcp -m state --state NEW'
' -m tcp --dport 9001 -j ACCEPT')
assert gerritbot_matrix_prom in rules
def test_gerritbot_logs(host): def test_gerritbot_logs(host):