From 839bc15371c9feb5aa76d6f75b9a29b8133e24e6 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 9 Feb 2017 22:47:32 +0000 Subject: [PATCH] Enable proxy05 local mirrorlist Signed-off-by: Patrick Uiterwijk --- playbooks/groups/proxies.yml | 2 +- roles/haproxy/templates/haproxy.cfg | 2 +- .../mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 354f75aad0..d01a567a27 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -20,7 +20,7 @@ - sudo - rsyncd - { role: mirrormanager/mirrorlist_proxy, - when: env == "staging" or ansible_hostname == "proxy02" } + when: env == "staging" or ansible_hostname == "proxy02" or ansible_hostname == "proxy05" } - { role: openvpn/client, when: env != "staging" } - apache diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 288cf63990..4cc9bccb96 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -51,7 +51,7 @@ listen mirror-lists 0.0.0.0:10002 server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3 backup {% endif %} {% if env == "production" %} -{% if inventory_hostname_short == 'proxy02' %} +{% if inventory_hostname_short == 'proxy02' or inventory_hostname_short == 'proxy05' %} 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 diff --git a/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh b/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh index 538e8aec9e..5437eb2bc0 100644 --- a/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh +++ b/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh @@ -9,7 +9,7 @@ done # sync also to new mirrorlist containers on proxies -MIRRORLIST_PROXY="proxy02.fedoraproject.org" +MIRRORLIST_PROXY="proxy02.fedoraproject.org proxy05.fedoraproject.org" for s in ${MIRRORLIST_PROXY}; do rsync -az --delete-delay --delay-updates --delete /var/lib/mirrormanager/{*pkl,*txt} ${s}:/srv/mirrorlist/data/mirrorlist1/