opendev/system-config
Code Issues Proposed changes

Add Jammy gitea-lb02 to our inventory

Browse Source 
This adds our first Jammy production server to the mix. We update the
gitea load balancer as it is a fairly simple service which will allow us
to focus on Jammy updates and not various server updates.

We update testing to shift testing to a jammy node as well. We don't
remove gitea-lb01 yet as this will happen after we switch DNS over to
the new server and are happy with it.

Change-Id: I8fb992e23abf9e97756a3cfef996be4c85da9e6f
This commit is contained in:
Clark Boylan 2022-10-13 13:09:13 -07:00
parent c30a5b822d
commit 8d4f1c719e
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -16,6 +16,7 @@ cacti_hosts:
- eavesdrop01.opendev.org - eavesdrop01.opendev.org
- etherpad01.opendev.org - etherpad01.opendev.org
- gitea-lb01.opendev.org - gitea-lb01.opendev.org
- gitea-lb02.opendev.org
- gitea01.opendev.org - gitea01.opendev.org
- gitea02.opendev.org - gitea02.opendev.org
- gitea03.opendev.org - gitea03.opendev.org

7
inventory/base/hosts.yaml
View File

@ -104,6 +104,13 @@ all:
cloud: openstackci-vexxhost cloud: openstackci-vexxhost
region_name: sjc1 region_name: sjc1
public_v4: 38.108.68.124 public_v4: 38.108.68.124
gitea-lb02.opendev.org:
ansible_host: 38.108.68.66
location:
cloud: openstackci-vexxhost
region_name: sjc1
public_v4: 38.108.68.66
public_v6: 2604:e100:3:0:f816:3eff:fea7:28c6
gitea01.opendev.org: gitea01.opendev.org:
ansible_host: 38.108.68.172 ansible_host: 38.108.68.172
location: location:

2
testinfra/test_gitea_lb.py
View File

@ -15,7 +15,7 @@
import json import json
testinfra_hosts = ['gitea-lb01.opendev.org'] testinfra_hosts = ['gitea-lb02.opendev.org']
def test_gitea_listening(host): def test_gitea_listening(host):

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

@ -588,8 +588,8 @@
nodes: nodes:
- name: bridge.openstack.org - name: bridge.openstack.org
label: ubuntu-bionic label: ubuntu-bionic
- name: gitea-lb01.opendev.org - name: gitea-lb02.opendev.org
label: ubuntu-bionic label: ubuntu-jammy
- name: gitea99.opendev.org - name: gitea99.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
required-projects: required-projects:
@ -619,7 +619,7 @@
'/var/gitea/certs': logs '/var/gitea/certs': logs
'/var/gitea/logs': logs '/var/gitea/logs': logs
'/var/log/apache2': logs '/var/log/apache2': logs
gitea-lb01.opendev.org: gitea-lb02.opendev.org:
host_copy_output: host_copy_output:
'/var/haproxy/etc': logs '/var/haproxy/etc': logs
'/var/log/haproxy.log': logs '/var/log/haproxy.log': logs