opendev/system-config
Code Issues Proposed changes

Re-add gitea01 replacement to inventory

Browse Source 
Add new IP addresses to inventory for the rebuild, but don't
reactivate it in the haproxy pools yet.

Note this switches the gitea testing to use a host called gitea99 so
that it doesn't conflict with our changes of the production hosts.

Change-Id: I9779e16cca423bcf514dd3a8d9f14e91d43f1ca3
This commit is contained in:
Jeremy Stanley 2019-07-23 20:25:47 +00:00 committed by Clark Boylan
parent df23d48949
commit 5587c299ea
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -623,7 +623,7 @@
label: ubuntu-bionic label: ubuntu-bionic
- name: gitea-lb01.opendev.org - name: gitea-lb01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: gitea01.opendev.org - name: gitea99.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
vars: vars:
run_playbooks: run_playbooks:
@ -631,7 +631,7 @@
- playbooks/remote_puppet_git.yaml - playbooks/remote_puppet_git.yaml
run_test_playbook: playbooks/test-gitea.yaml run_test_playbook: playbooks/test-gitea.yaml
host-vars: host-vars:
gitea01.opendev.org: gitea99.opendev.org:
host_copy_output: host_copy_output:
'/var/gitea/conf': logs '/var/gitea/conf': logs
'/var/gitea/certs': logs '/var/gitea/certs': logs

7
inventory/openstack.yaml
View File

@ -167,6 +167,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
gitea01.opendev.org:
ansible_host: 38.108.68.172
location:
cloud: openstackci-vexxhost
region_name: sjc1
public_v4: 38.108.68.172
public_v6: 2604:e100:3:0:f816:3eff:fe16:274
gitea02.opendev.org: gitea02.opendev.org:
ansible_host: 38.108.68.122 ansible_host: 38.108.68.122
location: location:

4
playbooks/group_vars/gitea-lb.yaml
View File

@ -4,7 +4,7 @@ haproxy_listeners:
- ':::80' - ':::80'
servers: servers:
#- name: 'gitea01.opendev.org' #- name: 'gitea01.opendev.org'
# address: '38.108.68.93:3080' # address: '38.108.68.172:3080'
- name: 'gitea02.opendev.org' - name: 'gitea02.opendev.org'
address: '38.108.68.122:3080' address: '38.108.68.122:3080'
- name: 'gitea03.opendev.org' - name: 'gitea03.opendev.org'
@ -24,7 +24,7 @@ haproxy_listeners:
- ':::443' - ':::443'
servers: servers:
#- name: 'gitea01.opendev.org' #- name: 'gitea01.opendev.org'
# address: '38.108.68.93:3000' # address: '38.108.68.172:3000'
- name: 'gitea02.opendev.org' - name: 'gitea02.opendev.org'
address: '38.108.68.122:3000' address: '38.108.68.122:3000'
- name: 'gitea03.opendev.org' - name: 'gitea03.opendev.org'

2
playbooks/remote_puppet_git.yaml
View File

@ -22,7 +22,7 @@
force: yes force: yes
register: gitinfo register: gitinfo
- hosts: "gitea:!disabled" - hosts: "gitea:!gitea01.opendev.org:!disabled"
name: "Create repos on gitea servers" name: "Create repos on gitea servers"
strategy: free strategy: free
max_fail_percentage: 1 max_fail_percentage: 1

8
playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2
View File

@ -3,11 +3,11 @@ haproxy_listeners:
bind: bind:
- ":::80" - ":::80"
servers: servers:
- name: "gitea01.opendev.org" - name: "gitea99.opendev.org"
address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080" address: "{{ (hostvars['gitea99.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080"
- name: balance_git_https - name: balance_git_https
bind: bind:
- ":::443" - ":::443"
servers: servers:
- name: "gitea01.opendev.org" - name: "gitea99.opendev.org"
address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3000" address: "{{ (hostvars['gitea99.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3000"

2
testinfra/test_gitea.py
View File

@ -13,7 +13,7 @@
# under the License. # under the License.
testinfra_hosts = ['gitea01.opendev.org'] testinfra_hosts = ['gitea99.opendev.org']
def test_gitea_listening(host): def test_gitea_listening(host):