Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix some problems with the previous git merge with the proxy host_vars. Add in a public_hostname for all proxies

Browse source
This commit is contained in:
Stephen Smoogen 2021-03-31 16:44:17 -04:00
parent 4104b9463c
commit bba58ea4c1
9 changed files with 70 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
inventory/host_vars/proxy02.fedoraproject.org
View file

@ -8,6 +8,7 @@ sponsor: internetx
vmhost: internetx01.fedoraproject.org vmhost: internetx01.fedoraproject.org
volgroup: /dev/vg_Server volgroup: /dev/vg_Server
mem_size: 8192 mem_size: 8192
max_mem_size: 8192 max_mem_size: 8192
num_cpus: 6 num_cpus: 6
@ -50,8 +51,8 @@ network_connections:
- "{{ dns2 }}" - "{{ dns2 }}"
- 2001:4860:4860::8888 - 2001:4860:4860::8888
dns_search: dns_search:
- vpn.fedoraproject.org - "{{ dns_search1 }}"
- fedoraproject.org - "{{ dns_search2 }}"
dhcp4: no dhcp4: no
auto6: no auto6: no

13
inventory/host_vars/proxy03.fedoraproject.org
View file

@ -8,12 +8,13 @@ sponsor: redhat
vmhost: virthost-cc-rdu02.fedoraproject.org vmhost: virthost-cc-rdu02.fedoraproject.org
volgroup: /dev/vg_guests volgroup: /dev/vg_guests
mem_size: 16384 mem_size: 16384
max_mem_size: 32768 max_mem_size: 32768
num_cpus: 8 num_cpus: 8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8 dns1: 8.8.8.8
dns2: 8.8.4.4 dns2: 8.8.4.4
@ -50,13 +51,13 @@ network_connections:
- "{{ dns2 }}" - "{{ dns2 }}"
- 2001:4860:4860::8888 - 2001:4860:4860::8888
dns_search: dns_search:
- vpn.fedoraproject.org - "{{ dns_search1 }}"
- fedoraproject.org - "{{ dns_search2 }}"
dhcp4: no dhcp4: no
auto6: no auto6: no
postfix_group: vpn postfix_group: vpn
vpn: true vpn: true
nrpe_procs_warn: 900 nrpe_procs_warn: 1200
nrpe_procs_crit: 1000 nrpe_procs_crit: 1400

18
inventory/host_vars/proxy04.fedoraproject.org
View file

@ -13,8 +13,11 @@ mem_size: 16384
max_mem_size: 20000 max_mem_size: 20000
num_cpus: 8 num_cpus: 8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8
dns2: 8.8.4.4
dns_search1: "vpn.fedoraproject.org" dns_search1: "vpn.fedoraproject.org"
dns_search2: "fedoraproject.org" dns_search2: "fedoraproject.org"
@ -28,27 +31,26 @@ has_ipv6: yes
eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed3" eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed3"
eth0_ipv6_nm: 64 eth0_ipv6_nm: 64
eth0_ipv6_gw: "2610:28:3090:3001::1" eth0_ipv6_gw: "2610:28:3090:3001::1"
dns1: 8.8.8.8
dns2: 8.8.4.4
mac0: 52:54:00:e3:bb:8f mac0: "52:54:00:e3:bb:8f"
public_hostname: proxy04.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:
address: address:
- "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
- "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
gateway4: "{{ eth0_ipv4_gw }}" gateway4: "{{ eth0_ipv4_gw }}"
gateway6: "{{ eth0_ipv6_gw }}" gateway6: "{{ eth0_ipv6_gw }}"
dns: dns:
- "{{ dns1 }}" - "{{ dns1 }}"
- "{{ dns2 }}" - "{{ dns2 }}"
dns_search: - 2001:4860:4860::8888
dns_search:
- "{{ dns_search1 }}" - "{{ dns_search1 }}"
- "{{ dns_search2 }}" - "{{ dns_search2 }}"
dhcp4: no dhcp4: no

4
inventory/host_vars/proxy05.fedoraproject.org
View file

@ -20,12 +20,12 @@ eth0_ipv4: 185.141.165.254
eth0_ipv4_nm: 23 eth0_ipv4_nm: 23
eth0_ipv4_gw: 185.141.164.1 eth0_ipv4_gw: 185.141.164.1
mac0: 06:5b:86:00:06:60 mac0: "06:5b:86:00:06:60"
public_hostname: proxy05.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:

14
inventory/host_vars/proxy06.fedoraproject.org
View file

@ -13,8 +13,11 @@ mem_size: 16384
max_mem_size: 20000 max_mem_size: 20000
num_cpus: 8 num_cpus: 8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8
dns2: 8.8.4.4
dns_search1: "vpn.fedoraproject.org" dns_search1: "vpn.fedoraproject.org"
dns_search2: "fedoraproject.org" dns_search2: "fedoraproject.org"
@ -32,23 +35,24 @@ dns1: 8.8.8.8
dns2: 8.8.4.4 dns2: 8.8.4.4
mac0: 52:54:00:fd:23:7f mac0: 52:54:00:fd:23:7f
public_hostname: proxy06.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:
address: address:
- "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
- "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
gateway4: "{{ eth0_ipv4_gw }}" gateway4: "{{ eth0_ipv4_gw }}"
gateway6: "{{ eth0_ipv6_gw }}" gateway6: "{{ eth0_ipv6_gw }}"
dns: dns:
- "{{ dns1 }}" - "{{ dns1 }}"
- "{{ dns2 }}" - "{{ dns2 }}"
dns_search: - 2001:4860:4860::8888
dns_search:
- "{{ dns_search1 }}" - "{{ dns_search1 }}"
- "{{ dns_search2 }}" - "{{ dns_search2 }}"
dhcp4: no dhcp4: no

13
inventory/host_vars/proxy09.fedoraproject.org
View file

@ -13,8 +13,8 @@ mem_size: 16384
max_mem_size: 20000 max_mem_size: 20000
num_cpus: 8 num_cpus: 8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8 dns1: 8.8.8.8
dns2: 8.8.4.4 dns2: 8.8.4.4
@ -31,27 +31,26 @@ has_ipv6: yes
eth0_ipv6: "2605:bc80:3010:600:dead:beef:cafe:feda" eth0_ipv6: "2605:bc80:3010:600:dead:beef:cafe:feda"
eth0_ipv6_nm: 64 eth0_ipv6_nm: 64
eth0_ipv6_gw: "2605:bc80:3010:600::1" eth0_ipv6_gw: "2605:bc80:3010:600::1"
dns1: 8.8.8.8
dns2: 8.8.4.4
mac0: 52:54:00:67:b2:6f mac0: 52:54:00:67:b2:6f
public_hostname: proxy09.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:
address: address:
- "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
- "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
gateway4: "{{ eth0_ipv4_gw }}" gateway4: "{{ eth0_ipv4_gw }}"
gateway6: "{{ eth0_ipv6_gw }}" gateway6: "{{ eth0_ipv6_gw }}"
dns: dns:
- "{{ dns1 }}" - "{{ dns1 }}"
- "{{ dns2 }}" - "{{ dns2 }}"
dns_search: - 2001:4860:4860::8888
dns_search:
- "{{ dns_search1 }}" - "{{ dns_search1 }}"
- "{{ dns_search2 }}" - "{{ dns_search2 }}"
dhcp4: no dhcp4: no

20
inventory/host_vars/proxy11.fedoraproject.org
View file

@ -1,5 +1,4 @@
--- ---
num_cpus: 10
freezes: true freezes: true
datacenter: dedicatedsolutions datacenter: dedicatedsolutions
@ -10,8 +9,12 @@ sponsor: dedicatedsolutions
vmhost: dedicatedsolutions01.fedoraproject.org vmhost: dedicatedsolutions01.fedoraproject.org
volgroup: /dev/vg_virthost volgroup: /dev/vg_virthost
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora mem_size: 16384
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ max_mem_size: 32768
num_cpus: 10
ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8 dns1: 8.8.8.8
dns2: 8.8.4.4 dns2: 8.8.4.4
@ -29,29 +32,30 @@ eth0_ipv6: "2604:1580:fe00:0:dead:beef:cafe:fed1"
eth0_ipv6_nm: 64 eth0_ipv6_nm: 64
eth0_ipv6_gw: "2604:1580:fe00::1" eth0_ipv6_gw: "2604:1580:fe00::1"
mac0: 52:54:00:96:fb:f7 mac0: "52:54:00:96:fb:f7"
public_hostname: proxy11.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:
address: address:
- "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
- "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
gateway4: "{{ eth0_ipv4_gw }}" gateway4: "{{ eth0_ipv4_gw }}"
gateway6: "{{ eth0_ipv6_gw }}" gateway6: "{{ eth0_ipv6_gw }}"
dns: dns:
- "{{ dns1 }}" - "{{ dns1 }}"
- "{{ dns2 }}" - "{{ dns2 }}"
dns_search: - 2001:4860:4860::8888
dns_search:
- "{{ dns_search1 }}" - "{{ dns_search1 }}"
- "{{ dns_search2 }}" - "{{ dns_search2 }}"
dhcp4: no dhcp4: no
auto6: no auto6: no
postfix_group: vpn postfix_group: vpn
vpn: true vpn: true

14
inventory/host_vars/proxy12.fedoraproject.org
View file

@ -13,8 +13,11 @@ mem_size: 16384
max_mem_size: 20000 max_mem_size: 20000
num_cpus: 8 num_cpus: 8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8
dns2: 8.8.4.4
dns_search1: "vpn.fedoraproject.org" dns_search1: "vpn.fedoraproject.org"
dns_search2: "fedoraproject.org" dns_search2: "fedoraproject.org"
@ -32,23 +35,24 @@ dns1: 8.8.8.8
dns2: 8.8.4.4 dns2: 8.8.4.4
mac0: "52:54:00:84:5d:9f" mac0: "52:54:00:84:5d:9f"
public_hostname: proxy12.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:
address: address:
- "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
- "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
gateway4: "{{ eth0_ipv4_gw }}" gateway4: "{{ eth0_ipv4_gw }}"
gateway6: "{{ eth0_ipv6_gw }}" gateway6: "{{ eth0_ipv6_gw }}"
dns: dns:
- "{{ dns1 }}" - "{{ dns1 }}"
- "{{ dns2 }}" - "{{ dns2 }}"
dns_search: - 2001:4860:4860::8888
dns_search:
- "{{ dns_search1 }}" - "{{ dns_search1 }}"
- "{{ dns_search2 }}" - "{{ dns_search2 }}"
dhcp4: no dhcp4: no

22
inventory/host_vars/proxy14.fedoraproject.org
View file

@ -13,8 +13,11 @@ mem_size: 16384
max_mem_size: 32768 max_mem_size: 32768
num_cpus: 8 num_cpus: 8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-fedora ks_url: http://38.145.60.16/repo/rhel/ks/kvm-fedora
ks_repo: http://209.132.181.6/pub/fedora/linux/releases/33/Server/x86_64/os/ ks_repo: http://38.145.60.16/pub/fedora/linux/releases/33/Server/x86_64/os/
dns1: 8.8.8.8
dns2: 8.8.4.4
dns_search1: "vpn.fedoraproject.org" dns_search1: "vpn.fedoraproject.org"
dns_search2: "fedoraproject.org" dns_search2: "fedoraproject.org"
@ -25,30 +28,29 @@ eth0_ipv4_nm: 24
eth0_ipv4_gw: 8.43.85.254 eth0_ipv4_gw: 8.43.85.254
has_ipv6: yes has_ipv6: yes
eth0_ipv6: "2620:52:3:1:dead:beef:cafe:fed7" eth0_ipv6: "2620:52:3:1:dead:beef:cafe:fed7"
eth0_ipv6_nm: 64 eth0_ipv6_nm: 64
eth0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe" eth0_ipv6_gw: "2620:52:3:1:ffff:ffff:ffff:fffe"
dns1: 8.8.8.8
dns2: 8.8.4.4
mac0: "52:54:00:19:67:0C" mac0: "52:54:00:19:67:0C"
public_hostname: proxy14.fedoraproject.org
network_connections: network_connections:
- name: eth0 - name: eth0
mac: "{{ mac0 }}" mac: "{{ mac0 }}"
state: up
type: ethernet type: ethernet
autoconnect: yes autoconnect: yes
ip: ip:
address: address:
- "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}" - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
- "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}" - "{{ eth0_ipv6 }}/{{ eth0_ipv6_nm }}"
gateway4: "{{ eth0_ipv4_gw }}" gateway4: "{{ eth0_ipv4_gw }}"
gateway6: "{{ eth0_ipv6_gw }}" gateway6: "{{ eth0_ipv6_gw }}"
dns: dns:
- "{{ dns1 }}" - "{{ dns1 }}"
- "{{ dns2 }}" - "{{ dns2 }}"
dns_search: - 2001:4860:4860::8888
dns_search:
- "{{ dns_search1 }}" - "{{ dns_search1 }}"
- "{{ dns_search2 }}" - "{{ dns_search2 }}"
dhcp4: no dhcp4: no