From 8e52ae742da33907b98fc8f413b3d19b5a2fd109 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 28 Feb 2019 17:02:16 +0000
Subject: [PATCH] Add gitea servers to inventory and load-balancer hostvars
We have new servers, and a new load balancer server, let's use them.
Change-Id: I5c58530b66637759c7882abb96967d0733bc8e6d
---
inventory/openstack.yaml | 54 ++++++++++++++++++++++++++++++
playbooks/group_vars/gitea-lb.yaml | 32 ++++++++++++++++--
2 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index c03de6b3a1..2a2d364d5b 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -182,6 +182,60 @@ all:
region_name: DFW
public_v4: 104.130.155.115
public_v6: 2001:4800:7818:103:be76:4eff:fe04:40aa
+ gitea-lb01.opendev.org:
+ ansible_host: 38.108.68.124
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.124
+ gitea01.opendev.org:
+ ansible_host: 38.108.68.93
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.93
+ gitea02.opendev.org:
+ ansible_host: 38.108.68.122
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.122
+ gitea03.opendev.org:
+ ansible_host: 38.108.68.133
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.133
+ gitea04.opendev.org:
+ ansible_host: 38.108.68.115
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.115
+ gitea05.opendev.org:
+ ansible_host: 38.108.68.55
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.55
+ gitea06.opendev.org:
+ ansible_host: 38.108.68.130
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.130
+ gitea07.opendev.org:
+ ansible_host: 38.108.68.86
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.86
+ gitea08.opendev.org:
+ ansible_host: 38.108.68.22
+ location:
+ cloud: openstackci-vexxhost
+ region_name: sjc1
+ public_v4: 38.108.68.22
git.openstack.org:
ansible_host: 2001:4800:7819:103:be76:4eff:fe04:77e6
location:
diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml
index cf3e117a6d..2d6bc2745e 100644
--- a/playbooks/group_vars/gitea-lb.yaml
+++ b/playbooks/group_vars/gitea-lb.yaml
@@ -4,13 +4,41 @@ haproxy_listeners:
- '*:80'
servers:
- name: 'gitea01.opendev.org'
- address: '127.0.0.1:80' # placeholder
+ address: '38.108.68.93:3080'
+ - name: 'gitea02.opendev.org'
+ address: '38.108.68.122:3080'
+ - name: 'gitea03.opendev.org'
+ address: '38.108.68.133:3080'
+ - name: 'gitea04.opendev.org'
+ address: '38.108.68.115:3080'
+ - name: 'gitea05.opendev.org'
+ address: '38.108.68.55:3080'
+ - name: 'gitea06.opendev.org'
+ address: '38.108.68.130:3080'
+ - name: 'gitea07.opendev.org'
+ address: '38.108.68.86:3080'
+ - name: 'gitea08.opendev.org'
+ address: '38.108.68.22:3080'
- name: balance_git_https
bind:
- '*:443'
servers:
- name: 'gitea01.opendev.org'
- address: '127.0.0.1:443' # placeholder
+ address: '38.108.68.93:3000'
+ - name: 'gitea02.opendev.org'
+ address: '38.108.68.122:3000'
+ - name: 'gitea03.opendev.org'
+ address: '38.108.68.133:3000'
+ - name: 'gitea04.opendev.org'
+ address: '38.108.68.115:3000'
+ - name: 'gitea05.opendev.org'
+ address: '38.108.68.55:3000'
+ - name: 'gitea06.opendev.org'
+ address: '38.108.68.130:3000'
+ - name: 'gitea07.opendev.org'
+ address: '38.108.68.86:3000'
+ - name: 'gitea08.opendev.org'
+ address: '38.108.68.22:3000'
iptables_extra_public_tcp_ports:
- 443
- 80