infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

drop 2 mirrorlists we do not need

Browse source
This commit is contained in:
Kevin Fenzi 2017-08-10 22:40:39 +00:00
parent b0ff16f989
commit fcf82e738c
6 changed files with 0 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

13
inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org
View file

@ -1,13 +0,0 @@
---
nm: 255.255.255.248
gw: 67.219.144.65
dns: 8.8.8.8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_virthost
eth0_ip: 67.219.144.67
has_ipv6: yes
eth0_ipv6: "2604:1580:fe00:0:5054:ff:fe3d:2b37"
eth0_ipv6_gw: "2604:1580:fe00::1"
vmhost: dedicatedsolutions01.fedoraproject.org
datacenter: dedicatedsolutions

4
inventory/host_vars/mirrorlist-host1plus.fedoraproject.org
View file

@ -1,4 +0,0 @@
---
# This is now a cloud instance provided by host1plus
# vmhost: none
datacenter: host1plus

11
inventory/host_vars/mirrorlist-osuosl.fedoraproject.org
View file

@ -1,11 +0,0 @@
---
nm: 255.255.255.192
gw: 140.211.169.193
dns: 8.8.8.8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
volgroup: /dev/vg_server
eth0_ip: 140.211.169.228
eth0_nm: 255.255.255.128
vmhost: osuosl02.fedoraproject.org
datacenter: osuosl

2
inventory/inventory
View file

@ -477,10 +477,8 @@ memcached02.phx2.fedoraproject.org
memcached01.stg.phx2.fedoraproject.org
[mirrorlist2]
mirrorlist-dedicatedsolutions.fedoraproject.org
mirrorlist-host1plus.fedoraproject.org
mirrorlist-ibiblio02.fedoraproject.org
mirrorlist-osuosl.fedoraproject.org
mirrorlist-phx2.phx2.fedoraproject.org
[mirrorlist2-stg]

27
playbooks/groups/mirrorlist2.yml
View file

@ -57,33 +57,6 @@
- collectd/base
- mod_wsgi
- httpd/mod_ssl
- role: httpd/certificate
name: wildcard-2017.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert
when: env == "staging"
- role: httpd/website
name: mirrorlist-phx2.stg.phx2.fedoraproject.org
cert_name: wildcard-2017.stg.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.stg.fedoraproject.org.intermediate.cert
when: env == "staging"
- role: httpd/certificate
name: wildcard-2017.fedoraproject.org
SSLCertificateChainFile: wildcard-2017.fedoraproject.org.intermediate.cert
when: env != "staging"
- role: httpd/website
name: mirrorlist-phx2.fedoraproject.org
cert_name: wildcard-2017.fedoraproject.org
server_aliases:
- mirrorlist-dedicatedsolutions.fedoraproject.org
- mirrorlist-host1plus.fedoraproject.org
- mirrorlist-ibiblio02.fedoraproject.org
- mirrorlist-osuosl.fedoraproject.org
when: env != "staging"
- mirrormanager/mirrorlist2
- sudo
- { role: openvpn/client,

4
roles/haproxy/templates/haproxy.cfg
View file

@ -55,15 +55,11 @@ listen mirror-lists 0.0.0.0:10002
server mirrorlist-local1 localhost:18081 check inter 1s rise 2 fall 3 weight 100
server mirrorlist-local2 localhost:18082 check inter 1s rise 2 fall 3 weight 100
server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3 backup
server mirrorlist-dedicatedsolutions mirrorlist-dedicatedsolutions:80 check inter 5s rise 2 fall 3 backup
server mirrorlist-host1plus mirrorlist-host1plus:80 check inter 5s rise 2 fall 3 backup
server mirrorlist-ibiblio02 mirrorlist-ibiblio02:80 check inter 5s rise 2 fall 3 backup
server mirrorlist-osuosl mirrorlist-osuosl:80 check inter 5s rise 2 fall 3 backup
{% else %}
server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3
server mirrorlist-dedicatedsolutions mirrorlist-dedicatedsolutions:80 check inter 5s rise 2 fall 3
server mirrorlist-ibiblio02 mirrorlist-ibiblio02:80 check inter 5s rise 2 fall 3
server mirrorlist-osuosl mirrorlist-osuosl:80 check inter 5s rise 2 fall 3
server mirrorlist-host1plus mirrorlist-host1plus:80 check inter 5s rise 2 fall 3 backup
{% endif %}
{% endif %}