From 263c2f9f19fc4fd513a4c990233edb3a2ee9863b Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 23 Mar 2015 07:25:12 +0000 Subject: [PATCH 01/21] Switching from CNAME to A record for mirror.switch.ch/frisal.switch.ch --- roles/rsyncd/files/rsyncd.conf.download-ibiblio | 8 ++++---- roles/rsyncd/files/rsyncd.conf.download-phx2 | 8 ++++---- roles/rsyncd/files/rsyncd.conf.download-rdu | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/rsyncd/files/rsyncd.conf.download-ibiblio b/roles/rsyncd/files/rsyncd.conf.download-ibiblio index a483fcdf4a..85f790e81f 100644 --- a/roles/rsyncd/files/rsyncd.conf.download-ibiblio +++ b/roles/rsyncd/files/rsyncd.conf.download-ibiblio @@ -68,7 +68,7 @@ refuse options = checksum list = no uid = 263 gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu 10.64.10.11 mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu 10.64.10.11 mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-buffet0] comment = Fedora Buffet for Tier0|1 Mirrors @@ -76,7 +76,7 @@ refuse options = checksum list = no uid = 263 gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-epel0] comment = Fedora EPEL for Tier0|1 Mirrors @@ -84,7 +84,7 @@ refuse options = checksum list = no uid = 263 gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-alt0] comment = Fedora ALT for Tier0|1 Mirrors @@ -92,7 +92,7 @@ refuse options = checksum list = no uid = 100103 gid = 101737 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch # For distributing applications [log] diff --git a/roles/rsyncd/files/rsyncd.conf.download-phx2 b/roles/rsyncd/files/rsyncd.conf.download-phx2 index 8bf342d10b..031a84bc58 100644 --- a/roles/rsyncd/files/rsyncd.conf.download-phx2 +++ b/roles/rsyncd/files/rsyncd.conf.download-phx2 @@ -72,7 +72,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu 10.64.10.11 mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu 10.64.10.11 mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-buffet0] comment = Fedora Buffet for Tier0|1 Mirrors @@ -80,7 +80,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-epel0] comment = Fedora EPEL for Tier0|1 Mirrors @@ -88,7 +88,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-alt0] comment = Fedora ALT for Tier0|1 Mirrors @@ -96,7 +96,7 @@ refuse options = checksum list = no uid = 100103 gid = 101737 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch # For distributing applications [log] diff --git a/roles/rsyncd/files/rsyncd.conf.download-rdu b/roles/rsyncd/files/rsyncd.conf.download-rdu index 89629623bd..efe456c323 100644 --- a/roles/rsyncd/files/rsyncd.conf.download-rdu +++ b/roles/rsyncd/files/rsyncd.conf.download-rdu @@ -68,7 +68,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu 10.64.10.11 mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu 10.64.10.11 mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-buffet0] comment = Fedora Buffet for Tier0|1 Mirrors @@ -76,7 +76,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 torrent01.fedoraproject.org torrent02.fedoraproject.org sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 152.19.134.145 152.19.134.195 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-epel0] comment = Fedora EPEL for Tier0|1 Mirrors @@ -84,7 +84,7 @@ refuse options = checksum list = no uid = nobody gid = 263 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch [fedora-alt0] comment = Fedora ALT for Tier0|1 Mirrors @@ -92,7 +92,7 @@ refuse options = checksum list = no uid = 100103 gid = 101737 - hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 mirror.switch.ch + hosts allow = jobbot1.ibiblio.org 200.17.202.1/28 zeus1.kernel.org zeus2.kernel.org zeus3.kernel.org zeus4.kernel.org 149.20.20.132 204.152.191.36 199.6.1.170 130.239.17.3 sinclair.wpi.edu bonaparte.hrz.tu-chemnitz.de josephine.hrz.tu-chemnitz.de mirror.speedpartner.de rsyncer.ftp.heanet.ie archive.linux.duke.edu lists.us.dell.com auslistsprd01.us.dell.com auslistsdr01.us.dell.com 198.129.224.34 mirror.hiwaay.net sagres.c3sl.ufpr.br mail.fedoraunity.org scrye.com odysseus.fi.muni.cz odysseus.linux.cz rhlx01.hs-esslingen.de ftp.nrc.ca zaphod.gtlib.gatech.edu 128.171.104.148 129.21.171.98 sunsite.mff.cuni.cz sunsite.ms.mff.cuni.cz ultra.linux.cz ftp.cz.kernel.org 202.158.214.12 speculum.rbc.ru 71.19.151.18 mirrors.mit.edu solar-one.mit.edu mirrors.xmission.com 182.255.111.7 2001:388:1:4066:225:90ff:fec7:777e mirror.prgmr.com tiz-korg-mirror.kernel.org sfo-korg-mirror.kernel.org 129.7.128.189 129.7.128.190 129.101.198.59 frisal.switch.ch # For distributing applications [log] From 92b607351f0a5e0581ebbde9d66fcf2b0aae57e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 08:46:57 +0000 Subject: [PATCH 02/21] finalize attaching volumes final touch after testing. This really works. --- inventory/host_vars/copr-be-dev.cloud.fedoraproject.org | 5 +++++ tasks/persistent_cloud_new.yml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index bc7911e955..4f3bc6c9c2 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -9,6 +9,11 @@ public_ip: 209.132.184.179 root_auth_users: bkabrda msuchy tradej pingou vgologuz description: copr dispatcher and repo server - dev instance tcp_ports: ['22', '80', '443'] +# volumes: copr-be-dev-db +volumes: [ {volume_id: 'b41e4d70-8f76-44b5-ab24-d91f02ae0afa', device: '/dev/vdc'} ] +inventory_tenant: persistent +# name of machine in OpenStack +inventory_instance_name: copr-be-dev # Copr vars copr_hostbase: copr-be-dev diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index bcdf73f497..0a2c301ff0 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -63,5 +63,6 @@ # when: volumes is defined and vm_status.stdout != "ACTIVE" # instance can be both id and name, volume must be id -- shell: source keystonerc_admin && nova --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item}} ' | grep 'available' && nova --os-tenant-name={{inventory_tenant}} volume-attach "{{inventory_instance_name}}" "{{item}}" - with_items: inventory_volumes +# volume must be id +- shell: source keystonerc_admin && nova --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available' && nova --os-tenant-name={{inventory_tenant}} volume-attach "{{inventory_instance_name}}" "{{item.volume_id}}" "{{item.device}}" + with_items: volumes From d8785d5a981f98cb1c6f6a71b1cb22a208bb52d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 08:54:44 +0000 Subject: [PATCH 03/21] attach volumes only when there are volumes to attach --- tasks/persistent_cloud_new.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index 0a2c301ff0..cc4ef70f3e 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -66,3 +66,6 @@ # volume must be id - shell: source keystonerc_admin && nova --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available' && nova --os-tenant-name={{inventory_tenant}} volume-attach "{{inventory_instance_name}}" "{{item.volume_id}}" "{{item.device}}" with_items: volumes + # FIXME finish 'and vm_status.stdout != "ACTIVE"' when we know what vm_status will be + when: volumes is defined and vm_status.stdout != "ACTIVE" + From 7ea4bcc6227722bc378fb56a4d15da123053b920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 09:18:44 +0000 Subject: [PATCH 04/21] get flavour_id before executing nova_compute nova_compute do not accept flavour name, it must be id --- tasks/persistent_cloud_new.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index cc4ef70f3e..ec85158384 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -29,6 +29,9 @@ # local_action: "nova_compute insecure=True auth_url={{OS_AUTH_URL}} login_username={{OS_USERNAME}} login_password={{OS_PASSWORD}} #login_tenant_name={{OS_TENANT_NAME}} name={{inventory_hostname}} image_id={{ image }} wait_for=300 flavor_id={{ flavor_id }} security_groups={{security_group}} key_name={{keypair}} nics=[{{}}]" # register: nova_result +- name: get flavour ID + local_action: shell source /root/keystonerc_admin && nova | grep ' {{ instance_type }} ' | awk '{print $2}' + register: FLAVOUR_ID - name: spin UP VM using nova_compute #delegate_to: 127.0.0.1 @@ -43,7 +46,7 @@ name: "{{inventory_hostname}}" image_id: "{{ image }}" wait_for: 300 - flavor_id: "{{ flavor_id }}" # TODO: conversion from `instance_type` + flavor_id: "{{ FLAVOUR_ID.stdout }}" security_groups: "{{security_group}}" key_name: "{{ keypair }}" nics: "{{ cloud_networks }}" From f50cc88040cf89700e24384c39f44e440804f7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 09:28:10 +0000 Subject: [PATCH 05/21] define security groups for copr-be-dev --- inventory/host_vars/copr-be-dev.cloud.fedoraproject.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index 4f3bc6c9c2..507a9064cd 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -2,7 +2,7 @@ instance_type: m1.xlarge image: "{{ f20_qcow_id }}" keypair: fedora-admin-20130801 -security_group: webserver +security_group: web-80-anywhere-persistent,web-443-anywhere-persistent,ssh-anywhere-persistent,default zone: nova hostbase: copr-be-dev- public_ip: 209.132.184.179 From 2b162762ba23f33d8c7e814eed96b35164ebce9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 09:32:55 +0000 Subject: [PATCH 06/21] typo --- tasks/persistent_cloud_new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index ec85158384..f427281cbd 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -30,7 +30,7 @@ # register: nova_result - name: get flavour ID - local_action: shell source /root/keystonerc_admin && nova | grep ' {{ instance_type }} ' | awk '{print $2}' + local_action: shell source /root/keystonerc_admin && nova flavor-list | grep ' {{ instance_type }} ' | awk '{print $2}' register: FLAVOUR_ID - name: spin UP VM using nova_compute @@ -39,7 +39,7 @@ local_action: module: nova_compute insecure: True - auth_url: "{{OS_AUTH_URL}}" + auth_url: "{{os_auth_url}}" login_username: "{{OS_USERNAME}}" login_password: "{{OS_PASSWORD}}" login_tenant_name: "{{OS_TENANT_NAME}}" From 026ce009195da1638c06bcf8789fe5af4fea9d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 09:44:13 +0000 Subject: [PATCH 07/21] remove FIXME - it actually works --- tasks/persistent_cloud_new.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index f427281cbd..e2433631ad 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -69,6 +69,5 @@ # volume must be id - shell: source keystonerc_admin && nova --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available' && nova --os-tenant-name={{inventory_tenant}} volume-attach "{{inventory_instance_name}}" "{{item.volume_id}}" "{{item.device}}" with_items: volumes - # FIXME finish 'and vm_status.stdout != "ACTIVE"' when we know what vm_status will be - when: volumes is defined and vm_status.stdout != "ACTIVE" + when: volumes is defined and vm_status.stdout == "ACTIVE" From 1b54f37dbddc12eb6099b3c1018b6c09d47e3f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 12:36:51 +0000 Subject: [PATCH 08/21] add filters for openstack --- README | 2 ++ filter_plugins/openstack.py | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 filter_plugins/openstack.py diff --git a/README b/README index e3b97b5fa7..bce9c8d951 100644 --- a/README +++ b/README @@ -20,6 +20,8 @@ tasks - snippets of tasks that should be included in plays roles - specific roles to be use in playbooks. Each role has it's own files/templates/vars +filter_plugins - Jinja filters + == Paths == public path for everything is: diff --git a/filter_plugins/openstack.py b/filter_plugins/openstack.py new file mode 100644 index 0000000000..69266b4971 --- /dev/null +++ b/filter_plugins/openstack.py @@ -0,0 +1,26 @@ +from ansible import errors, runner +import json +from novaclient.v3.client import Client +import novaclient.exceptions; + +def flavor_id_to_name(host_vars, user, password, tenant, auth_url): + nt = Client(user, password, tenant, auth_url, service_type="compute") + try: + flavor = nt.flavors.get(host_vars) + except novaclient.exceptions.NotFound: + raise errors.AnsibleFilterError('There is no flavor of name {0}'.format(host_vars)) + return flavor.name + + +def flavor_name_to_id(host_vars, user, password, tenant, auth_url): + nt = Client(user, password, tenant, auth_url, service_type="compute") + for i in nt.flavors.list(): + if i.name == host_vars: + return i.id + raise errors.AnsibleFilterError('There is no flavor of id {0}'.format(host_vars)) + +class FilterModule (object): + def filters(self): + return {"flavor_id_to_name": flavor_id_to_name, + "flavor_name_to_id": flavor_name_to_id, + } From 87023dbd2a35bf875bc485a2a851d5b5b70d7cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 13:09:37 +0000 Subject: [PATCH 09/21] use filter instead of registered action --- tasks/persistent_cloud_new.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index e2433631ad..bbbb43f907 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -29,10 +29,6 @@ # local_action: "nova_compute insecure=True auth_url={{OS_AUTH_URL}} login_username={{OS_USERNAME}} login_password={{OS_PASSWORD}} #login_tenant_name={{OS_TENANT_NAME}} name={{inventory_hostname}} image_id={{ image }} wait_for=300 flavor_id={{ flavor_id }} security_groups={{security_group}} key_name={{keypair}} nics=[{{}}]" # register: nova_result -- name: get flavour ID - local_action: shell source /root/keystonerc_admin && nova flavor-list | grep ' {{ instance_type }} ' | awk '{print $2}' - register: FLAVOUR_ID - - name: spin UP VM using nova_compute #delegate_to: 127.0.0.1 sudo: False @@ -46,7 +42,7 @@ name: "{{inventory_hostname}}" image_id: "{{ image }}" wait_for: 300 - flavor_id: "{{ FLAVOUR_ID.stdout }}" + flavor_id: "{{ instance_type|flavor_name_to_id('admin', ADMIN_PASS, inventory_tenant, os_auth_url) }} security_groups: "{{security_group}}" key_name: "{{ keypair }}" nics: "{{ cloud_networks }}" From 98aafc387b9806faec245bccbeaddde36d32d967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 13:33:33 +0000 Subject: [PATCH 10/21] sync up variables --- inventory/host_vars/209.132.184.49 | 2 +- tasks/persistent_cloud_new.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inventory/host_vars/209.132.184.49 b/inventory/host_vars/209.132.184.49 index fa109c31ad..4af88173d3 100644 --- a/inventory/host_vars/209.132.184.49 +++ b/inventory/host_vars/209.132.184.49 @@ -6,7 +6,7 @@ image: "86422ca2-6eeb-435c-87e8-402b3c7c3b7b" keypair: "fedora-admin-20130801" security_group: ssh-anywhere-coprdev,default OS_TENANT_ID: "566a072fb1694950998ad191fee3833b" -OS_TENANT_NAME: "coprdev" +inventory_tenant: "coprdev" zone: nova hostbase: copr-be-dev2- public_ip: 209.132.184.49 diff --git a/tasks/persistent_cloud_new.yml b/tasks/persistent_cloud_new.yml index bbbb43f907..52b893fca2 100644 --- a/tasks/persistent_cloud_new.yml +++ b/tasks/persistent_cloud_new.yml @@ -36,10 +36,10 @@ module: nova_compute insecure: True auth_url: "{{os_auth_url}}" - login_username: "{{OS_USERNAME}}" - login_password: "{{OS_PASSWORD}}" - login_tenant_name: "{{OS_TENANT_NAME}}" - name: "{{inventory_hostname}}" + login_username: "admin" + login_password: "{{ADMIN_PASS}}" + login_tenant_name: "{{inventory_tenant}}" + name: "{{inventory_instance_name}}" image_id: "{{ image }}" wait_for: 300 flavor_id: "{{ instance_type|flavor_name_to_id('admin', ADMIN_PASS, inventory_tenant, os_auth_url) }} From b4be4fe3d294ee017c1e087396bfe89bf78f36c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Mar 2015 16:04:11 +0000 Subject: [PATCH 11/21] add image_id_to_name filter --- filter_plugins/openstack.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/filter_plugins/openstack.py b/filter_plugins/openstack.py index 69266b4971..43073f5d63 100644 --- a/filter_plugins/openstack.py +++ b/filter_plugins/openstack.py @@ -1,7 +1,11 @@ from ansible import errors, runner -import json +from glanceclient import Client as GlanceClient +from keystoneclient import session +from keystoneclient.auth.identity import v2 as identity from novaclient.v3.client import Client -import novaclient.exceptions; +import glanceclient.exc +import json +import novaclient.exceptions def flavor_id_to_name(host_vars, user, password, tenant, auth_url): nt = Client(user, password, tenant, auth_url, service_type="compute") @@ -19,8 +23,21 @@ def flavor_name_to_id(host_vars, user, password, tenant, auth_url): return i.id raise errors.AnsibleFilterError('There is no flavor of id {0}'.format(host_vars)) +def image_id_to_name(host_vars, user, password, tenant, auth_url): + auth = identity.Password(auth_url=auth_url, username=user, + password=password, tenant_name=tenant) + sess = session.Session(auth=auth) + token = auth.get_token(sess) + endpoint = auth.get_endpoint(sess, service_name='glance', service_type='image') + glance = GlanceClient('2', endpoint=endpoint, token=token) + try: + return glance.images.get(host_vars).name + except glanceclient.exc.HTTPNotFound: + raise errors.AnsibleFilterError('There is no image of id {0}'.format(host_vars)) + class FilterModule (object): def filters(self): return {"flavor_id_to_name": flavor_id_to_name, "flavor_name_to_id": flavor_name_to_id, + "image_id_to_name": image_id_to_name, } From 24c7c84ad579560d897d173321941f5faa964ebf Mon Sep 17 00:00:00 2001 From: Josef Skladanka Date: Mon, 23 Mar 2015 16:11:55 +0000 Subject: [PATCH 12/21] Deploy ExecDB to the ResultsDB-dev-machine --- inventory/group_vars/resultsdb-dev | 8 ++- inventory/group_vars/taskotron-dev | 1 + inventory/group_vars/taskotron-dev-clients | 1 + .../host_vars/db-qa01.qa.fedoraproject.org | 1 + playbooks/groups/resultsdb-dev.yml | 3 +- .../templates/taskotron.master.cfg.j2 | 20 ++++++- roles/taskotron/execdb/tasks/main.yml | 57 +++++++++++++++++++ .../taskotron/execdb/templates/execdb.conf.j2 | 34 +++++++++++ .../taskotron/execdb/templates/settings.py.j2 | 20 +++++++ .../templates/taskotron.yaml.j2 | 3 + 10 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 roles/taskotron/execdb/tasks/main.yml create mode 100644 roles/taskotron/execdb/templates/execdb.conf.j2 create mode 100644 roles/taskotron/execdb/templates/settings.py.j2 diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev index 36c27423a1..116548c802 100644 --- a/inventory/group_vars/resultsdb-dev +++ b/inventory/group_vars/resultsdb-dev @@ -6,7 +6,7 @@ num_cpus: 4 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}" ] +tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}", "{{ execdb_db_port }}" ] fas_client_groups: sysadmin-qa,sysadmin-main nrpe_procs_warn: 250 nrpe_procs_crit: 300 @@ -24,6 +24,12 @@ resultsdb_db_port: 5432 resultsdb_endpoint: 'resultsdb_api' resultsdb_fe_endpoint: 'resultsdb' resultsdb_db_name: resultsdb_dev + +execdb_db_host: db-qa01.qa.fedoraproject.org +execdb_db_port: 5432 +execdb_endpoint: 'execdb' +execdb_db_name: execdb_dev + allowed_hosts: - 10.5.124 diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index c3f8ecca19..fdf9168990 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -21,6 +21,7 @@ buildslave_dir: /home/buildslave/slave master_dir: /home/buildmaster/master master_user: buildmaster external_hostname: taskotron-dev.fedoraproject.org +execdb_statuspush: http://resultsdb-dev01.qa.fedoraproject.org/execdb/buildbottest resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0 resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/ resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/ diff --git a/inventory/group_vars/taskotron-dev-clients b/inventory/group_vars/taskotron-dev-clients index b6650eea13..f40a460cc4 100644 --- a/inventory/group_vars/taskotron-dev-clients +++ b/inventory/group_vars/taskotron-dev-clients @@ -5,6 +5,7 @@ num_cpus: 2 slave_user: buildslave taskotron_fas_user: taskotron +execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb resultsdb_server: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0/ bodhi_server: http://10.5.124.181/fakefedorainfra/bodhi/ kojihub_url: http://koji.fedoraproject.org/kojihub diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org index 504efc5a8a..c7353d3330 100644 --- a/inventory/host_vars/db-qa01.qa.fedoraproject.org +++ b/inventory/host_vars/db-qa01.qa.fedoraproject.org @@ -22,6 +22,7 @@ dbs_to_backup: - fakefedorainfra - fakefedorainfra_stg - dev_fakefedorainfra +- execdb_dev - resultsdb - resultsdb_stg - resultsdb_dev diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 1ce76cec77..ad5f38a4b3 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -49,7 +49,7 @@ handlers: - include: "{{ handlers }}/restart_services.yml" -- name: configure resultsdb +- name: configure resultsdb and execdb hosts: resultsdb-dev user: root gather_facts: True @@ -62,6 +62,7 @@ roles: - { role: taskotron/resultsdb-backend, tags: ['resultsdb-be'] } - { role: taskotron/resultsdb-frontend, tags: ['resultsdb-fe'] } + - { role: taskotron/execdb, tags: ['execdb'] } handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 67ac2ebba4..ac56fb75bd 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -126,6 +126,12 @@ c['schedulers'].append(ForceScheduler( label='type of object to use', default='', size=256), +{% if deployment_type == 'dev' %} + StringParameter(name='uuid', + label='UUID of the build in progress', + default='', + size=256), +{% endif %} StringParameter(name='arch', label='arch of rpm to test', default='x86_64', @@ -158,9 +164,9 @@ factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }} mode='full', method='clobber')) # run the runner -factory.addStep(ShellCommand(command=["runtask", '-i', - Interpolate('%(prop:item)s'), '-t', - Interpolate('%(prop:item_type)s'), +factory.addStep(ShellCommand(command=["runtask", + '-i', Interpolate('%(prop:item)s'), + '-t', Interpolate('%(prop:item_type)s'), '-a', Interpolate('%(prop:arch)s'), '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'), {% if deployment_type == 'dev' %} @@ -356,6 +362,14 @@ mn = MailNotifier(fromaddr='taskotron@fedoraproject.org', c['status'].append(mn) +{% if deployment_type == 'dev' %} +# ExecDB's push-notifications: +import buildbot.status.status_push +sp = buildbot.status.status_push.HttpStatusPush( + serverUrl="{{ execdb_statuspush }}", + debug=True) +c['status'].append(sp) +{% endif %} ####### PROJECT IDENTITY diff --git a/roles/taskotron/execdb/tasks/main.yml b/roles/taskotron/execdb/tasks/main.yml new file mode 100644 index 0000000000..31d8ddefc1 --- /dev/null +++ b/roles/taskotron/execdb/tasks/main.yml @@ -0,0 +1,57 @@ +- name: ensure packages required for execdb are installed + action: yum name={{ item }} state=latest + with_items: + - execdb + - mod_wsgi + - python-psycopg2 + - libsemanage-python + +- name: ensure database is created + delegate_to: "{{ execdb_db_host }}" + sudo_user: postgres + sudo: true + action: postgresql_db db={{ execdb_db_name }} + +- name: ensure dev execdb db user has access to dev database + when: deployment_type == 'dev' + delegate_to: "{{ execdb_db_host }}" + sudo_user: postgres + sudo: true + action: postgresql_user db={{ execdb_db_name }} user={{ dev_execdb_db_user }} password={{ dev_execdb_db_password }} role_attr_flags=NOSUPERUSER + +- name: ensure stg execdb db user has access to stg database + when: deployment_type == 'stg' + delegate_to: "{{ execdb_db_host }}" + sudo_user: postgres + sudo: true + action: postgresql_user db={{ execdb_db_name }} user={{ stg_execdb_db_user }} password={{ stg_execdb_db_password }} role_attr_flags=NOSUPERUSER + +- name: ensure prod execdb db user has access to prod database + when: deployment_type == 'prod' + delegate_to: "{{ execdb_db_host }}" + sudo_user: postgres + sudo: true + action: postgresql_user db={{ execdb_db_name }} user={{ prod_execdb_db_user }} password={{ prod_execdb_db_password }} role_attr_flags=NOSUPERUSER + +- name: ensure local execdb db user has access to prod database + when: deployment_type == 'local' + delegate_to: "{{ execdb_db_host }}" + sudo_user: postgres + sudo: true + action: postgresql_user db={{ execdb_db_name }} user={{ local_execdb_db_user }} password={{ local_execdb_db_password }} role_attr_flags=NOSUPERUSER + +- name: ensure selinux lets httpd talk to postgres + seboolean: name=httpd_can_network_connect_db persistent=yes state=yes + +- name: generate execdb config + template: src=settings.py.j2 dest=/etc/execdb/settings.py owner=root group=root mode=0644 + notify: + - restart httpd + +- name: generate execdb apache config + template: src=execdb.conf.j2 dest=/etc/httpd/conf.d/execdb.conf owner=root group=root mode=0644 + notify: + - restart httpd + +- name: initialize execdb database + shell: PROD='true' execdb init_db diff --git a/roles/taskotron/execdb/templates/execdb.conf.j2 b/roles/taskotron/execdb/templates/execdb.conf.j2 new file mode 100644 index 0000000000..cb52a054f5 --- /dev/null +++ b/roles/taskotron/execdb/templates/execdb.conf.j2 @@ -0,0 +1,34 @@ +WSGIDaemonProcess execdb user=apache group=apache threads=5 +WSGIScriptAlias /{{ execdb_endpoint }} /usr/share/execdb/execdb.wsgi +WSGISocketPrefix run/wsgi + +# this isn't the best way to force SSL but it works for now +#RewriteEngine On +#RewriteCond %{HTTPS} !=on +#RewriteRule ^/execdb/admin/?(.*) https://%{SERVER_NAME}/$1 [R,L] + + + WSGIProcessGroup execdb + WSGIApplicationGroup %{GLOBAL} + WSGIScriptReloading On + + # Apache 2.4 + + Require method GET + Require ip 127.0.0.1 ::1{% for host in allowed_hosts %} {{ host }}{% endfor %} + + + + + Order allow,deny + Allow from all + + + + +#Alias /execdb/static /var/www/execdb/execdb/static + +# +#Order allow,deny +#Allow from all +# diff --git a/roles/taskotron/execdb/templates/settings.py.j2 b/roles/taskotron/execdb/templates/settings.py.j2 new file mode 100644 index 0000000000..854bac94e7 --- /dev/null +++ b/roles/taskotron/execdb/templates/settings.py.j2 @@ -0,0 +1,20 @@ +{%- if deployment_type == 'prod' %} +SECRET_KEY = '{{ prod_execdb_secret_key }}' +SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ prod_execdb_db_user }}:{{ prod_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}' +{% endif %} +{%- if deployment_type == 'stg' %} +SECRET_KEY = '{{ stg_execdb_secret_key }}' +SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ stg_execdb_db_user }}:{{ stg_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}' +{% endif %} +{%- if deployment_type == 'dev' %} +SECRET_KEY = '{{ dev_execdb_secret_key }}' +SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ dev_execdb_db_user }}:{{ dev_execdb_db_password }}@{{ execdb_db_host }}:{{ execdb_db_port }}/{{ execdb_db_name }}' +{% endif %} +{%- if deployment_type == 'local' %} +SECRET_KEY = '{{ local_execdb_secret_key }}' +SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ local_execdb_db_user }}:{{ local_execdb_db_password }}@127.0.0.1:{{ execdb_db_port }}/{{ execdb_db_name }}' +{% endif %} +FILE_LOGGING = False +LOGFILR = '/var/log/execdb/execdb.log' +SYSLOG_LOGGING = False +STREAM_LOGGING = True diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 index 379aba77eb..a4155321e6 100644 --- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 @@ -55,6 +55,9 @@ bodhi_server: {{ bodhi_server }} ## URL of ResultsDB server API interface, which can store all test results resultsdb_server: {{ resultsdb_server }} +## URL of ExecDB server API interface, which tracks task execution status +execdb_server: {{ execdb_server }} + ## URL of taskotron buildmaster taskotron_master: {{ taskotron_master }} From 996ce3778454d78b9878256231fb07cc5def0a2f Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 23 Mar 2015 16:33:28 +0000 Subject: [PATCH 13/21] By default it tries to use the VPN connection anitya-backend01 denies ssh via VPN connection Signed-off-by: Patrick Uiterwijk --- scripts/public-db-copy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/public-db-copy b/scripts/public-db-copy index bae78592be..8c6894b5b5 100755 --- a/scripts/public-db-copy +++ b/scripts/public-db-copy @@ -8,4 +8,4 @@ scp db-datanommer02:/backups/datanommer-$(date +%F).dump.xz /srv/web/infra/db-du scp db-koji01:/backups/koji-$(date +%F).dump.xz /srv/web/infra/db-dumps/koji.dump.xz scp db01:/backups/pkgdb2-$(date +%F).dump.xz /srv/web/infra/db-dumps/pkgdb2.dump.xz scp db01:/backups/fedoratagger-$(date +%F).dump.xz /srv/web/infra/db-dumps/fedoratagger.dump.xz -scp anitya-backend01:/backups/anitya-$(date +%F).dump.xz /srv/web/infra/db-dumps/anitya.dump.xz +scp anitya-backend01.fedoraproject.org:/backups/anitya-$(date +%F).dump.xz /srv/web/infra/db-dumps/anitya.dump.xz From b01be3cdd014d07e3f200331cb8f91eb4aa5de09 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Mar 2015 17:03:55 +0000 Subject: [PATCH 14/21] paste01.stg was moved. --- inventory/host_vars/paste01.stg.phx2.fedoraproject.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/host_vars/paste01.stg.phx2.fedoraproject.org b/inventory/host_vars/paste01.stg.phx2.fedoraproject.org index aea0bc141d..4d627852c8 100644 --- a/inventory/host_vars/paste01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/paste01.stg.phx2.fedoraproject.org @@ -4,7 +4,7 @@ gw: 10.5.126.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6 ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_virthost16 +volgroup: /dev/vg_guests eth0_ip: 10.5.126.61 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 From bab0792dcbb90694eb97b589d237041504f25871 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 23 Mar 2015 18:51:58 +0000 Subject: [PATCH 15/21] add aarch64 HW to buildhw group --- playbooks/groups/buildhw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 0054099947..55f1d9d7a6 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/buildhw or from hostvars - name: make koji builder(s) on raw hw - hosts: buildhw;buildppc;buildarm:bkernel + hosts: buildhw;buildppc;buildarm;buildaarch64:bkernel user: root gather_facts: True From 316fb7da4ec83dfac6966c2489b67e99c76e682c Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 23 Mar 2015 19:14:44 +0000 Subject: [PATCH 16/21] and we have basic proxy jobs for p05 and p11 --- .../#mirrorlist-host1plus.fedoraproject.org# | 10 +++++++++ inventory/host_vars/proxy05.fedoraproject.org | 22 +++++++++++++++++++ inventory/host_vars/proxy11.fedoraproject.org | 21 ++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org# create mode 100644 inventory/host_vars/proxy05.fedoraproject.org create mode 100644 inventory/host_vars/proxy11.fedoraproject.org diff --git a/inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org# b/inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org# new file mode 100644 index 0000000000..4470d79022 --- /dev/null +++ b/inventory/host_vars/#mirrorlist-host1plus.fedoraproject.org# @@ -0,0 +1,10 @@ +--- +nm: 255.255.255.0 +gw: 5.175.150.1 +dns: 217.69.160.18 +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_virthost +eth0_ip: 5.175.150.49 +vmhost: host1plus01.fedoraproject.org +datacenter: host1plus diff --git a/inventory/host_vars/proxy05.fedoraproject.org b/inventory/host_vars/proxy05.fedoraproject.org new file mode 100644 index 0000000000..2fd6368aed --- /dev/null +++ b/inventory/host_vars/proxy05.fedoraproject.org @@ -0,0 +1,22 @@ +--- +nm: 255.255.255.0 +gw: 5.175.150.1 +dns: 8.8.8.8 +num_cpus: 4 + +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ + +vmhost: host1plus01.fedoraproject.org +volgroup: /dev/vg_virthost + +eth0_ip: 5.175.150.50 + +# This is consumed by the roles/fedora-web/main role +sponsor: host1plus +datacenter: host1plus +postfix_group: vpn + +nrpe_procs_warn: 1200 +nrpe_procs_crit: 1400 + diff --git a/inventory/host_vars/proxy11.fedoraproject.org b/inventory/host_vars/proxy11.fedoraproject.org new file mode 100644 index 0000000000..68d97c91a2 --- /dev/null +++ b/inventory/host_vars/proxy11.fedoraproject.org @@ -0,0 +1,21 @@ +--- +nm: 255.255.255.0 +gw: 67.219.144.1 +dns: 8.8.8.8 +num_cpus: 4 + +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ + +vmhost: host1plus01.fedoraproject.org +volgroup: /dev/vg_virthost + +eth0_ip: 67.219.144.68 + +# This is consumed by the roles/fedora-web/main role +sponsor: host1plus +datacenter: host1plus +postfix_group: vpn + +nrpe_procs_warn: 1200 +nrpe_procs_crit: 1400 From e232a4ce500f6143b5eb3d3f9b22745899206a2a Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 23 Mar 2015 20:33:32 +0000 Subject: [PATCH 17/21] man adding a proxy means putting it in a lot of files --- inventory/inventory | 2 ++ roles/base/files/syncHttpLogs.sh | 3 +++ roles/epylog/files/merged/modules.d/rsyncd.conf | 2 +- roles/hosts/files/ask01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/ask02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/elections01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/elections02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts | 2 +- .../hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/staging-hosts | 2 +- roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts | 2 +- 30 files changed, 33 insertions(+), 28 deletions(-) diff --git a/inventory/inventory b/inventory/inventory index bda68950b2..7237761c14 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -414,11 +414,13 @@ proxy01.phx2.fedoraproject.org proxy02.fedoraproject.org proxy03.fedoraproject.org proxy04.fedoraproject.org +proxy05.fedoraproject.org proxy06.fedoraproject.org proxy07.fedoraproject.org proxy08.fedoraproject.org proxy09.fedoraproject.org proxy10.phx2.fedoraproject.org +proxy11.fedoraproject.org [proxies-stg] proxy01.stg.phx2.fedoraproject.org diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 5c5729a3de..ed66f32621 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -32,10 +32,13 @@ syncHttpLogs proxy01.phx2.fedoraproject.org syncHttpLogs proxy02.vpn.fedoraproject.org syncHttpLogs proxy03.vpn.fedoraproject.org syncHttpLogs proxy04.vpn.fedoraproject.org +# syncHttpLogs proxy05.vpn.fedoraproject.org syncHttpLogs proxy06.vpn.fedoraproject.org syncHttpLogs proxy07.vpn.fedoraproject.org syncHttpLogs proxy08.vpn.fedoraproject.org syncHttpLogs proxy09.vpn.fedoraproject.org +syncHttpLogs proxy10.phx2.fedoraproject.org +# syncHttpLogs proxy11.phx2.fedoraproject.org syncHttpLogs proxy01.stg.phx2.fedoraproject.org syncHttpLogs app01.stg.phx2.fedoraproject.org syncHttpLogs bapp02.phx2.fedoraproject.org diff --git a/roles/epylog/files/merged/modules.d/rsyncd.conf b/roles/epylog/files/merged/modules.d/rsyncd.conf index 2c8e4c3b12..dfc0edadde 100644 --- a/roles/epylog/files/merged/modules.d/rsyncd.conf +++ b/roles/epylog/files/merged/modules.d/rsyncd.conf @@ -12,5 +12,5 @@ priority = 7 # Report this many "top ranking hosts" # report_top = 10 -ignore_hosts = log01.vpn.fedoraproject.org log01.phx2.fedoraproject.org proxy3.vpn.fedoraproject.org proxy04.vpn.fedoraproject.org proxy6.vpn.fedoraproject.org proxy01.phx2.fedoraproject.org proxy07.vpn.fedoraproject.org proxy02.vpn.fedoraproject.org proxy03.vpn.fedoraproject.org proxy06.vpn.fedoraproject.org collab04.fedoraproject.org hosted04.fedoraproject.org admin.fedoraproject.org proxy01.stg.phx2.fedoraproject.org proxy08.vpn.fedoraproject.org proxy09.vpn.fedoraproject.org +ignore_hosts = log01.vpn.fedoraproject.org log01.phx2.fedoraproject.org proxy01.phx2.fedoraproject.org proxy02.vpn.fedoraproject.org proxy03.vpn.fedoraproject.org proxy04.vpn.fedoraproject.org proxy05.vpn.fedoraproject.org proxy06.vpn.fedoraproject.org proxy07.vpn.fedoraproject.org proxy08.vpn.fedoraproject.org proxy09.vpn.fedoraproject.org proxy10.phx2.fedoraproject.org proxy11.phx2.fedoraproject.org collab04.fedoraproject.org hosted04.fedoraproject.org admin.fedoraproject.org proxy01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts index 83bb8f3323..ab21ee2887 100644 --- a/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-ask diff --git a/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts index 83bb8f3323..ab21ee2887 100644 --- a/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-ask diff --git a/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts index de1321c876..8794e3afd6 100644 --- a/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts @@ -1,5 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-tahrir db-tahrir diff --git a/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts index 47c63d6964..9f784a6208 100644 --- a/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts @@ -1,5 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-tahrir db-tahrir diff --git a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts index b35e9efd38..1edc4cd748 100644 --- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db diff --git a/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts index bf1479fbfb..d2c0f25a6a 100644 --- a/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-elections db-elections diff --git a/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts index bf1479fbfb..d2c0f25a6a 100644 --- a/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-elections db-elections diff --git a/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts index d251c6de16..5e9ad46e04 100644 --- a/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedimg01.phx2.fedoraproject.org-hosts @@ -1,6 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts index e9c13a6938..7315dced09 100644 --- a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org bapp02 memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts index 8c572411cd..6fa17dd6ab 100644 --- a/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts @@ -2,7 +2,7 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-fedocal db-fedocal diff --git a/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts index 8c572411cd..6fa17dd6ab 100644 --- a/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts @@ -2,7 +2,7 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-fedocal db-fedocal diff --git a/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts b/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts index 91ea8d3a66..ede502a56e 100644 --- a/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts @@ -1,5 +1,5 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-github2fedmsg diff --git a/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts b/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts index d251c6de16..5e9ad46e04 100644 --- a/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/hotness01.phx2.fedoraproject.org-hosts @@ -1,6 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts index e9c13a6938..e95078721e 100644 --- a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org bapp02 memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts index f895745094..5303b0b5ab 100644 --- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db diff --git a/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts index 501a532425..b74480ad5e 100644 --- a/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts @@ -1,6 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-notifs db-notifs 10.5.126.111 db-datanommer db-datanommer02 diff --git a/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts index 027d3279d5..9a533828fe 100644 --- a/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts @@ -1,6 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-notifs db-notifs 10.5.126.111 db-datanommer db-datanommer02 diff --git a/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts index b4c462fb4e..92bc2456cf 100644 --- a/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts @@ -1,6 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 db-notifs db-notifs 10.5.126.111 db-datanommer db-datanommer02 diff --git a/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts index 457fadaa73..b7b332c4b2 100644 --- a/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 nuancier_db nuancier_db diff --git a/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts index 457fadaa73..b7b332c4b2 100644 --- a/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.71 nuancier_db nuancier_db diff --git a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts index 31d6ac2d8a..03273c2afe 100644 --- a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts @@ -3,7 +3,7 @@ 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.23 puppet.fedoraproject.org puppet puppet01 puppet01.phx2.fedoraproject.org 10.5.126.51 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org pkgs pkgs01 10.5.126.81 app01.phx2.fedoraproject.org app1 app3 app5 bapp1 app01 app03 app05 bapp01 bapp02 10.5.126.81 memcached04.phx2.fedoraproject.org memcached04 memcached03 memcached01 memcached02 diff --git a/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts index 5c379f41b3..e21dbf743d 100644 --- a/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts @@ -2,7 +2,7 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org diff --git a/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts index 5c379f41b3..e21dbf743d 100644 --- a/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts @@ -2,7 +2,7 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.51 admin.fedoraproject.org -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts index 4b7152dd00..025cc30093 100644 --- a/roles/hosts/files/staging-hosts +++ b/roles/hosts/files/staging-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.81 app01.stg.fedoraproject.org bapp02 memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts b/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts index 120526e687..e4b43a6cd4 100644 --- a/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts @@ -1,6 +1,6 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.126.71 db-summershum db-summershum diff --git a/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts index 71b853189c..19a64118fb 100644 --- a/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.63 koji.fedoraproject.org diff --git a/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts index 71b853189c..19a64118fb 100644 --- a/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org +10.5.126.51 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.63 koji.fedoraproject.org From 1d5d0f99cb55b5f323a8386c9221e6e34ab19887 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 23 Mar 2015 21:02:20 +0000 Subject: [PATCH 18/21] Make crawler log files available via http To enable the mirror admins to consult the last output of the MM2 crawler, this makes the logs available via http. This still needs the corresponding forwards on the reverse proxy. --- .../mirrormanager/crawler/files/mirrormanager.conf | 13 +++++++++++++ roles/mirrormanager/crawler/tasks/main.yml | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 roles/mirrormanager/crawler/files/mirrormanager.conf diff --git a/roles/mirrormanager/crawler/files/mirrormanager.conf b/roles/mirrormanager/crawler/files/mirrormanager.conf new file mode 100644 index 0000000000..b4c92580cf --- /dev/null +++ b/roles/mirrormanager/crawler/files/mirrormanager.conf @@ -0,0 +1,13 @@ +Alias /mirrormanager/crawler /var/log/mirrormanager/crawler + + + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + + diff --git a/roles/mirrormanager/crawler/tasks/main.yml b/roles/mirrormanager/crawler/tasks/main.yml index eb2672d6cb..eedbca8c44 100644 --- a/roles/mirrormanager/crawler/tasks/main.yml +++ b/roles/mirrormanager/crawler/tasks/main.yml @@ -9,6 +9,7 @@ - name: install needed packages yum: pkg={{ item }} state=present with_items: + - httpd - mirrormanager2-crawler - python-psycopg2 - fedmsg @@ -30,3 +31,12 @@ copy: src=crawler.cron dest=/etc/cron.d/mm2_crawler.cron tags: - config + +- name: install configuration file + template: src={{ roles }}/mirrormanager/crawler/files/mirrormanager.conf + dest=/etc/httpd/conf.d/mirrormanager.conf + owner=apache group=apache mode=0600 + notify: + - restart httpd + tags: + - config From a1b74f4cafd0a3795c0eed92f4bcf855ea4f36fc Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 23 Mar 2015 21:56:21 +0000 Subject: [PATCH 19/21] and we try to make listspam a little less. --- roles/httpd/templates/mailman-proxy.conf.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/httpd/templates/mailman-proxy.conf.j2 b/roles/httpd/templates/mailman-proxy.conf.j2 index 8c422b04a1..edb74d329c 100644 --- a/roles/httpd/templates/mailman-proxy.conf.j2 +++ b/roles/httpd/templates/mailman-proxy.conf.j2 @@ -1,3 +1,9 @@ + + RewriteEngine on + RewriteCond %{REQUEST_METHOD} GET + RewriteRule ^/mailman/subscribe/(.*) / [R] + + ProxyPass {{ iconpath }} {{ proxyurl }}/icons ProxyPassReverse {{ iconpath }} {{ proxyurl }}/icons ProxyPass {{ path }} {{ proxyurl }}/mailman From 57dba81ae5df95c836e5e7f7408c1bc096a79d22 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 23 Mar 2015 22:18:07 +0000 Subject: [PATCH 20/21] and we need to use the right kickstart or it just sits there forever --- inventory/host_vars/proxy05.fedoraproject.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/host_vars/proxy05.fedoraproject.org b/inventory/host_vars/proxy05.fedoraproject.org index 2fd6368aed..baea3f001f 100644 --- a/inventory/host_vars/proxy05.fedoraproject.org +++ b/inventory/host_vars/proxy05.fedoraproject.org @@ -4,7 +4,7 @@ gw: 5.175.150.1 dns: 8.8.8.8 num_cpus: 4 -ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +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/ vmhost: host1plus01.fedoraproject.org From 838ec2ec4c180d1ffbd9ee725078e3f157ec775d Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 23 Mar 2015 22:19:51 +0000 Subject: [PATCH 21/21] and we do this box too --- inventory/host_vars/proxy11.fedoraproject.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/host_vars/proxy11.fedoraproject.org b/inventory/host_vars/proxy11.fedoraproject.org index 68d97c91a2..236b5b79ee 100644 --- a/inventory/host_vars/proxy11.fedoraproject.org +++ b/inventory/host_vars/proxy11.fedoraproject.org @@ -4,7 +4,7 @@ gw: 67.219.144.1 dns: 8.8.8.8 num_cpus: 4 -ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7 +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/ vmhost: host1plus01.fedoraproject.org