diff --git a/inventory/host_vars/mirrorlist-serverbeach.fedoraproject.org b/inventory/host_vars/mirrorlist-serverbeach.fedoraproject.org deleted file mode 100644 index 84567bc5a1..0000000000 --- a/inventory/host_vars/mirrorlist-serverbeach.fedoraproject.org +++ /dev/null @@ -1,24 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 192.168.122.1 -dns: 66.135.45.92 -ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6 -ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_host -eth0_ip: 192.168.122.2 -vmhost: serverbeach10.fedoraproject.org -datacenter: serverbeach - -# This uses a different virt-install due to wacky serverbeach network/setup -virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk {{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --autostart --noautoconsole - -# -# For some reason this instance can't do the full 45 procs without issues. -# -mirrorlist_procs: 25 diff --git a/inventory/inventory b/inventory/inventory index 2981de79c6..236283c9b4 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -343,7 +343,6 @@ memcached02.phx2.fedoraproject.org mirrorlist-osuosl.fedoraproject.org mirrorlist-ibiblio.fedoraproject.org mirrorlist-phx2.phx2.fedoraproject.org -mirrorlist-serverbeach.fedoraproject.org [other] people03.fedoraproject.org diff --git a/roles/nagios_server/files/nagios/hosts/mirrorlist-serverbeach.cfg b/roles/nagios_server/files/nagios/hosts/mirrorlist-serverbeach.cfg index 4ba4d080a0..bcb4fbc70e 100644 --- a/roles/nagios_server/files/nagios/hosts/mirrorlist-serverbeach.cfg +++ b/roles/nagios_server/files/nagios/hosts/mirrorlist-serverbeach.cfg @@ -1,7 +1,7 @@ -define host { - host_name mirrorlist-serverbeach - alias mirrorlist-serverbeach.fedoraproject.org - use defaulttemplate - address mirrorlist-serverbeach.fedoraproject.org - parents serverbeach10 -} +#define host { +# host_name mirrorlist-serverbeach +# alias mirrorlist-serverbeach.fedoraproject.org +# use defaulttemplate +# address mirrorlist-serverbeach.fedoraproject.org +# parents serverbeach10 +#} diff --git a/roles/nagios_server/files/nagios/services/file_age.cfg b/roles/nagios_server/files/nagios/services/file_age.cfg index 0c58af6d1e..4c0fba6ed9 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-serverbeach + host_name mirrorlist-osuosl, mirrorlist-ibiblio, mirrorlist-phx2 service_description Check MirrorList Cache check_command check_by_nrpe!check_mirrorlist_cache use defaulttemplate