From fcf82e738c4bc301e1d2038cf1d27aa531992c16 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 10 Aug 2017 22:40:39 +0000 Subject: [PATCH] drop 2 mirrorlists we do not need --- ...rlist-dedicatedsolutions.fedoraproject.org | 13 --------- .../mirrorlist-host1plus.fedoraproject.org | 4 --- .../mirrorlist-osuosl.fedoraproject.org | 11 -------- inventory/inventory | 2 -- playbooks/groups/mirrorlist2.yml | 27 ------------------- roles/haproxy/templates/haproxy.cfg | 4 --- 6 files changed, 61 deletions(-) delete mode 100644 inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org delete mode 100644 inventory/host_vars/mirrorlist-host1plus.fedoraproject.org delete mode 100644 inventory/host_vars/mirrorlist-osuosl.fedoraproject.org diff --git a/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org b/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org deleted file mode 100644 index 19d298eabd..0000000000 --- a/inventory/host_vars/mirrorlist-dedicatedsolutions.fedoraproject.org +++ /dev/null @@ -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 diff --git a/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org b/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org deleted file mode 100644 index ebd6151212..0000000000 --- a/inventory/host_vars/mirrorlist-host1plus.fedoraproject.org +++ /dev/null @@ -1,4 +0,0 @@ ---- -# This is now a cloud instance provided by host1plus -# vmhost: none -datacenter: host1plus diff --git a/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org b/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org deleted file mode 100644 index 98e8a168b0..0000000000 --- a/inventory/host_vars/mirrorlist-osuosl.fedoraproject.org +++ /dev/null @@ -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 diff --git a/inventory/inventory b/inventory/inventory index 7ba744634d..8eb8bcb1ed 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -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] diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index d307275bfa..84b9618806 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -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, diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index d91c3d6872..5207e51694 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -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 %}