From 9f7f9c95d3eb44aab8dbd73b4446812f27d40dea Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 24 Oct 2015 23:54:35 +0000 Subject: [PATCH] Add mirrorlist-ibiblio02 Signed-off-by: Patrick Uiterwijk --- .../host_vars/mirrorlist-ibiblio02.fedoraproject.org | 10 ++++++++++ inventory/inventory | 1 + playbooks/groups/mirrorlist2.yml | 1 + roles/haproxy/templates/haproxy.cfg | 1 + .../files/nagios/hosts/mirrorlist-ibiblio02.cfg | 7 +++++++ roles/nagios_server/files/nagios/services/file_age.cfg | 2 +- 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 diff --git a/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org b/inventory/host_vars/mirrorlist-ibiblio02.fedoraproject.org new file mode 100644 index 0000000000..13387ea3ea --- /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 2b432d7983..28a8ba4740 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 332b1bfe0d..5908beb54d 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 8404dc5052..65c25d3bf1 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 0000000000..5ff77ef9db --- /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 197e5c2835..658ae5634f 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