-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi all, I would like to setup mirrorlist-ibiblio02, to add one more node that can take the mirrorlist load. Can I get +1s for the following patches (and the corresponding private repo patches)? Ansible ~~~~~~~~~~~ 6 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org create mode 100644 roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio02.cfg [puiterwijk@batcave01 ansible]$ git show HEAD commit d7f9975716c5894ca0f0b88a482318baa11b745a Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> Date: Sat Oct 24 23:54:35 2015 +0000 Add mirrorlist-ibiblio02 Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> diff --git a/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org b/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org new file mode 100644 index 0000000..13387ea - --- /dev/null +++ b/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org @@ -0,0 +1,10 @@ +--- +nm: 255.255.255.128 +gw: 152.19.134.129 +dns: 152.2.21.1 +ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-7-ext +ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: 152.19.134.197 +vmhost: ibiblio05.fedoraproject.org +datacenter: ibiblio diff --git a/inventory/inventory b/inventory/inventory index 2b432d7..28a8ba4 100644 - --- a/inventory/inventory +++ b/inventory/inventory @@ -421,6 +421,7 @@ memcached01.stg.phx2.fedoraproject.org mirrorlist-dedicatedsolutions.fedoraproject.org mirrorlist-host1plus.fedoraproject.org mirrorlist-ibiblio.fedoraproject.org +mirrorlist-ibiblio02.fedoraproject.org mirrorlist-osuosl.fedoraproject.org mirrorlist-phx2.phx2.fedoraproject.org diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 332b1bf..5908beb 100644 - --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -81,6 +81,7 @@ - mirrorlist-dedicatedsolutions.fedoraproject.org - mirrorlist-host1plus.fedoraproject.org - mirrorlist-ibiblio.fedoraproject.org + - mirrorlist-ibiblio02.fedoraproject.org - mirrorlist-osuosl.fedoraproject.org when: env != "staging" diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 8404dc5..65c25d3 100644 - --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -45,6 +45,7 @@ listen mirror-lists 0.0.0.0:10002 server mirrorlist-dedicatedsolutions mirrorlist-dedicatedsolutions:80 check inter 5s rise 2 fall 3 server mirrorlist-host1plus mirrorlist-host1plus:80 check inter 5s rise 2 fall 3 server mirrorlist-ibiblio mirrorlist-ibiblio:80 check inter 5s rise 2 fall 3 + server mirrorlist-ibiblio02 mirrorlist-ibiblio02:80 check inter 5s rise 2 fall 3 server mirrorlist-osuosl mirrorlist-osuosl:80 check inter 5s rise 2 fall 3 server mirrorlist-phx2 mirrorlist-phx2:80 check inter 5s rise 2 fall 3 option httpchk GET /mirrorlist diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio02.cfg b/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio02.cfg new file mode 100644 index 0000000..5ff77ef - --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/mirrorlist-ibiblio02.cfg @@ -0,0 +1,7 @@ +define host { + host_name mirrorlist-ibiblio02 + alias mirrorlist-ibiblio02.fedoraproject.org + use defaulttemplate + address mirrorlist-ibiblio02.fedoraproject.org + parents ibiblio05 +} diff --git a/roles/nagios_server/files/nagios/services/file_age.cfg b/roles/nagios_server/files/nagios/services/file_age.cfg index 197e5c2..658ae56 100644 - --- a/roles/nagios_server/files/nagios/services/file_age.cfg +++ b/roles/nagios_server/files/nagios/services/file_age.cfg @@ -1,5 +1,5 @@ define service { - - host_name mirrorlist-osuosl, mirrorlist-ibiblio, mirrorlist-phx2, mirrorlist-host1plus, mirrorlist-dedicatedsolutions + host_name mirrorlist-osuosl, mirrorlist-ibiblio, mirrorlist-ibiblio02, mirrorlist-phx2, mirrorlist-host1plus, mirrorlist-dedicatedsolutions service_description Check MirrorList Cache check_command check_by_nrpe!check_mirrorlist_cache use defaulttemplate DNS ~~~~~~~ commit 3663572f0d63e12c604914919e9b3a8f070a965b Author: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> Date: Sat Oct 24 23:49:02 2015 +0000 Add DNS records for mirrorlist-ibiblio02 Signed-off-by: Patrick Uiterwijk <puiterwijk@xxxxxxxxxx> diff --git a/fedoraproject.org.template b/fedoraproject.org.template index de2374c..0c18c37 100644 - --- a/fedoraproject.org.template +++ b/fedoraproject.org.template @@ -240,6 +240,7 @@ meetbot-raw.stg IN CNAME admin.stg.fedoraproject.org. mirrorlist-dedicatedsolutions IN A 67.219.144.67 mirrorlist-host1plus IN A 5.175.150.49 mirrorlist-ibiblio IN A 152.19.134.194 +mirrorlist-ibiblio02 IN A 152.19.134.197 mirrorlist-osuosl IN A 140.211.169.228 mirrors IN CNAME wildcard mirrors.stg IN CNAME admin.stg.fedoraproject.org. diff --git a/master/168.192.in-addr.arpa b/master/168.192.in-addr.arpa index b44289b..473a887 100644 - --- a/master/168.192.in-addr.arpa +++ b/master/168.192.in-addr.arpa @@ -167,7 +167,7 @@ $TTL 86400 149.1 IN PTR mm-frontend02.vpn.fedoraproject.org. 150.1 IN PTR darkserver02.vpn.fedoraproject.org. 151.1 IN PTR mm-crawler03.vpn.fedoraproject.org. - -152.1 IN PTR unused. +152.1 IN PTR mirrorlist-ibiblio02.vpn.fedoraproject.org. 153.1 IN PTR unused. 154.1 IN PTR unused. 155.1 IN PTR unused. diff --git a/master/vpn.fedoraproject.org b/master/vpn.fedoraproject.org index d11f5f3..f2cb7b1 100644 - --- a/master/vpn.fedoraproject.org +++ b/master/vpn.fedoraproject.org @@ -108,6 +108,7 @@ log2 IN CNAME log02 mirrorlist-dedicatedsolutions IN A 192.168.1.140 mirrorlist-host1plus IN A 192.168.1.148 mirrorlist-ibiblio IN A 192.168.1.107 +mirrorlist-ibiblio02 IN A 192.168.1.152 mirrorlist-osuosl IN A 192.168.1.106 mirrorlist-phx2 IN A 192.168.1.108 mailman01 IN A 192.168.1.118 - -- With kind regards, Patrick Uiterwijk Fedora Infra -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCgAGBQJWLBqXAAoJEIZXmA2atR5QIwAQALMcOeC91fnrz3AS7vQzO5a1 PpjYXlaBVDTbO3NAHaKdeHUZMY0UpSHtJxxNBNI+AC9FetGfsGVbnemYsBrSULIi 6YCyPkPMk4zBdLfWz2xhJDX3Q/qGdFrwzXN9rp17H+qxYT9bXjG4S6jKVfMOmZGT jqu5NKk78QCvr+hjSWXOVrRAdajNoGo++OHsicCZ6v+Iswbk1RMGsTXH30yPLTMP zTJDOIdfq5TO3y49DTvon+ZxKgqn5iJFP/jKB5Bc1QBgixb+ko13jHaDyc5W43QI xouVWLeJ593B+/GTBiZ3/8gymfld67Fu/0WNKBiPyXJdeAmaf4GdFiOdEwmho9aR qWPi9/Jae6VRCuyectaX93iDv0VhzSJtXVsWROCr/vdherWEdx+0RMILrjtKc2se AVowapFe1Dy5B/bxSfaGdBRTspdW3xIiBto10ShE3bqgqiKeGQOEXoqo8esctBxF JMcPLbirsru93mTwuFsWc+Uc+FibGeNOVRzDj/n1Nv1RQyuM7CXrj+OqfZbTOT1a wSONSKdFz9Yt0iWUFNEV6rbjMNEnRgekRHEN88s3DuN/XyIc2kgs5Rndw479ZbcI vid5ZuRrvAyNgM/I5rO4Y1bJGbelVAo5rk9bFDZyOGNnWy3W6H5VVo80Nye/rb7T xhzvcYDlol/JwPhZXKTQ =FfgK -----END PGP SIGNATURE----- _______________________________________________ infrastructure mailing list infrastructure@xxxxxxxxxxxxxxxxxxxxxxx http://lists.fedoraproject.org/admin/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx