opendev/system-config
Code Issues Proposed changes

Merge "Re-add gitea01 replacement to inventory"

Browse Source
This commit is contained in:
Zuul 2019-07-24 00:09:30 +00:00 committed by Gerrit Code Review
commit c2f3f53389
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
- name: gitea-lb01.opendev.org
label: ubuntu-bionic
- name: gitea01.opendev.org
- name: gitea99.opendev.org
label: ubuntu-bionic
vars:
run_playbooks:
@ -631,7 +631,7 @@
- playbooks/remote_puppet_git.yaml
run_test_playbook: playbooks/test-gitea.yaml
host-vars:
gitea01.opendev.org:
gitea99.opendev.org:
host_copy_output:
'/var/gitea/conf': logs
'/var/gitea/certs': logs

7
inventory/openstack.yaml
View File

@ -167,6 +167,13 @@ all:
cloud: openstackci-vexxhost
region_name: sjc1
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:
ansible_host: 38.108.68.122
location:

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

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

2
playbooks/remote_puppet_git.yaml
View File

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

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

@ -3,11 +3,11 @@ haproxy_listeners:
bind:
- ":::80"
servers:
- name: "gitea01.opendev.org"
address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080"
- name: "gitea99.opendev.org"
address: "{{ (hostvars['gitea99.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080"
- name: balance_git_https
bind:
- ":::443"
servers:
- name: "gitea01.opendev.org"
address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3000"
- name: "gitea99.opendev.org"
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.
testinfra_hosts = ['gitea01.opendev.org']
testinfra_hosts = ['gitea99.opendev.org']
def test_gitea_listening(host):