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

and we no longer need mirrorlist-ibiblio after rebuild

Browse source
This commit is contained in:
Stephen Smoogen 2017-02-22 20:29:36 +00:00
parent f78d015cf4
commit ea5a7338cf
5 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/inventory
View file

@ -487,7 +487,6 @@ memcached01.stg.phx2.fedoraproject.org
[mirrorlist2]
mirrorlist-dedicatedsolutions.fedoraproject.org
mirrorlist-host1plus.fedoraproject.org
mirrorlist-ibiblio.fedoraproject.org
mirrorlist-ibiblio02.fedoraproject.org
mirrorlist-osuosl.fedoraproject.org
mirrorlist-phx2.phx2.fedoraproject.org

1
playbooks/groups/mirrorlist2.yml
View file

@ -80,7 +80,6 @@
server_aliases:
- mirrorlist-dedicatedsolutions.fedoraproject.org
- mirrorlist-host1plus.fedoraproject.org
- mirrorlist-ibiblio.fedoraproject.org
- mirrorlist-ibiblio02.fedoraproject.org
- mirrorlist-osuosl.fedoraproject.org
when: env != "staging"

1
roles/batcave/files/ssh_known_hosts
View file

@ -417,7 +417,6 @@ memcached01.stg.phx2.fedoraproject.org,memcached01.stg,10.5.126.210 ssh-rsa AAAA
memcached02.phx2.fedoraproject.org,memcached02,10.5.126.177 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnwkaJfMOSt+snkOpTg121Dai7Val4IBEvLgQ/54bCCda0/Svb59ojf3X2XMp7qLCNN3w0zfUUVEVkHHqE1ZvvopfaPXfzmPZN8QdJTwHD+7yZvdhCBmIFyn6UtVQOp/ZmByk7aVE9wzR1ZOLHnzNCTzi5t9fEPkGxCW8fzk+3MRS62eBXaUxZ2q22V/5mId4o3E/FTYtKtOhaaJOcnirD0pVNkgUcZuHy2bMSCDmDlMRKH6f2aoRYRb12SxKCYs7nk9TXI3gS7LJCOC9hllotTnDptylwACIK9l6ShoE5zYAMRGcS9jwo1oMCo0uEpAjdFCfPdYl3I/ZbtmV2/2D7 memcached02.phx2.fedoraproject.org
mirrorlist-dedicatedsolutions.fedoraproject.org,mirrorlist-dedicatedsolutions,67.219.144.67,2604:1580:fe00:0:5054:ff:fe3d:2b37,192.168.1.140 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJKMlwnhakNidjVfjvBkdgqcE7/wdzauvyCeK+w4EhX2J2faBRJiGfP2gpjnWBv4h8/eTe+3QYdN5BEcSTF8mXdcuMctO2iMcm/fr6pBFHhACRSn676GYpHEi+0a+IWpjzBBNEaa4V+uiolQBT5IJ+UJl9vqLlQlkpHXvb10zQguMuAoaWaZedw8may95JfGf2BeIGSmLQVbo6UbXX+0NAgNSgxjAMh0fIhaw9RzrefcMRMhW0WUmV3nPxedotbRc2CfecUH78NnvRc7/hvRBnivLFiHeD9MGk20nSLv5/8TfGQPlQurTiTsVvEXCjIvziBqJctNeslZ/TS/Gt2w/X mirrorlist-dedicatedsolutions.fedoraproject.org
mirrorlist-host1plus.fedoraproject.org,mirrorlist-host1plus,185.141.164.249,192.168.1.148 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2NNHheTPzmCRYeqIA+jvvMQiyUZvl9dxk0glji+H5bcfYgwYqXc/nDopRd2zk/NC2kOUnelzA6z/HqcYq3Qn7f1Fs5p2GMkFNosIXYCgsoF7TfFRFprpkQELt2LMh6pmzo+i6+YErziDs0HcvIAVlv/gZOtJzYcCQUgm4dEWCDy0uCEWITTaIH/cuOP9r+FG++8se281gVTLVXgBjjjd6GMLrKAz41fv+bRrZIYhvW2NqpfehqhxbVhG/AuiYpwMp6l0lLrReXv8xiCP75zIs8I8UeuOnYONc/QcN7VTdxLJf/6fe4JDtC5Nn6FUNVC3kfzE0XQ7LQX5Q+S6pgD9l mirrorlist-host1plus.fedoraproject.org
mirrorlist-ibiblio.fedoraproject.org,vm14.fedora.ibiblio.org,mirrorlist-ibiblio,152.19.134.194,2610:28:3090:3001:5054:ff:fef9:7285,192.168.1.107 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCweYhngPuCxMyfr7xP8p+IRM8LlsLFZPuGt/aLJ1oZGpikfuC5gV0Mb7CjMyW0QeIP68Z11U5ArC+z2c3QzH38dqF/PxfCgPNMzvAIvvF+uJ0gBKx5L0mgjVLqJvUvRBnUNSHqGKr8tYzjEQklfYBU+exkkv+4ACEuW355B2jMczLtJd7fd8b0EdqtYayi8GoQhIeF2cIfZGm/xQIJMPrF6Ord2mQTMHb1kkxB2Ene1gVg3ZiZ7UEV3MPc7LYSz9wBI5gjTAV7OTXVCPcM4ZqlBFGEFW2LBjntiJWbmHkW6RLhdK92ttugpACLB2+XiEP9Bqd4OrBxF/007YXjJDgn mirrorlist-ibiblio.fedoraproject.org
mirrorlist-ibiblio02.fedoraproject.org,vm17.fedora.ibiblio.org,mirrorlist-ibiblio02,152.19.134.197,2610:28:3090:3001:5054:ff:feb5:5472,192.168.1.152 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDvSPxht4KVYYdEF1648AGehvfNlSqikLpD7f+nV9lAb1qR1YdBvy5TWKaEdjymkf952CI558XZJlIvhMvwP0tIYS741L1n2BQgqLWQKBvzpowCwmcf2eNnvpKr4ozbDhkawVYAamYoAuaXFy6CUjEKwKLVzSHQzR9Bb5d2k5ZnrXGQHohE2lXCyaFwpux6aMwO1QnoKm36cT8Fng3uLu2EYUheJ2EzRZoNIBque2m+X4qNLF4a8QRqeRQesbV4JjYL9GBv5ZvU7ZDjgqS5bqXH6tnXhDah4xBrD+csNVB3yybEdcWMEaGlAkfWa/Yjm0aRD0jYbA9ZqF3X8wO9TtHd mirrorlist-ibiblio02.fedoraproject.org
mirrorlist-osuosl.fedoraproject.org,mirrorlist-osuosl,140.211.169.228,192.168.1.106 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDecgzgZofIDzpveNzRpsJTNwom0qeDYkpqeM+E9FPDwOErnjsDx/kvZgj5cf68UKOcTUSmKof7+pSrOb0W4/9Xa+K6MvW3WaxanwKOEzby0+OFUldDQzrA3uLUchH1ujcblOtT6w8juFJBN+XvwLuDeoTkKJFX06LlHMvEBOVVFvb1suVmsPFiFLWmUft326itkrvQohUbeieh+5/vX/XNTEPlcS/XAvYW6eThPyM/y0dFNBGndVpfZD4xmbXWPTU613Fh4Bc0EaEX/ykzhNZa1FKDQ8N5V10q8XdRB1GxVzvU9ttL2lL7SkqfTFix/CGZY0XSFFBbDRNjg+PODKO3 mirrorlist-osuosl.fedoraproject.org
mirrorlist-phx2.phx2.fedoraproject.org,mirrorlist-phx2,10.5.126.50,192.168.1.108 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSRV06DOVKp3K7iQBbjiAkIpSHamphvu9/Q4UxqoCqgs/S+Mc6ZLkSw/7ld14fC2reTxFNJEeKVM3+SHG2wC9kJyfC3SFPM8ft6UyaY+SBsi78VabdZHhap+Lj175a/J66SPAkAWkiZJfp5bKnL2apwmZFHayn5eTE0G9MFRUZnF8vZINDYlyQ/yKz2Tlls/0pjh9JbEwKTxVkCf21yicJ3Fyilj5BGZhozCkemeLjh+ieB/9sTq4VLb3suzx6sGpzJ3tBrnUguElsjykVxAbvME+OTLBoNH0rDyFkS4d9B8T940DOC2S68OWZ5ZWyM81XsShRTK5LTQ/an0pp1CP3 mirrorlist-phx2.phx2.fedoraproject.org

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

@ -57,13 +57,11 @@ listen mirror-lists 0.0.0.0:10002
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-ibiblio mirrorlist-ibiblio: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-ibiblio mirrorlist-ibiblio: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

14
roles/nagios/server/files/nagios/hosts/mirrorlist-ibiblio.cfg
View file

@ -1,7 +1,7 @@
define host {
host_name mirrorlist-ibiblio
alias mirrorlist-ibiblio.fedoraproject.org
use defaulttemplate
address mirrorlist-ibiblio.fedoraproject.org
parents ibiblio04
}
#define host {
# host_name mirrorlist-ibiblio
# alias mirrorlist-ibiblio.fedoraproject.org
# use defaulttemplate
# address mirrorlist-ibiblio.fedoraproject.org
# parents ibiblio04
#}