From f2a3db600a44419a74657f04fecf310c1a5924eb Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 29 Sep 2015 18:45:43 +0000 Subject: [PATCH] thank you peer1/serverbeach for your help to Fedora. good luck with your future --- inventory/host_vars/ns-sb01.fedoraproject.org | 37 ------------------- inventory/inventory | 13 +++---- playbooks/groups/virthost.yml | 2 +- .../files/nagios-external/hosts/ns-sb01.cfg | 26 ++++++------- .../files/nagios/hostgroups/kvmHosts.cfg | 2 +- .../files/nagios/hostgroups/vpnclients.cfg | 2 +- .../files/nagios/hosts/ns-sb01.cfg | 14 +++---- .../files/nagios/hosts/serverbeach09.cfg | 14 +++---- 8 files changed, 36 insertions(+), 74 deletions(-) delete mode 100644 inventory/host_vars/ns-sb01.fedoraproject.org diff --git a/inventory/host_vars/ns-sb01.fedoraproject.org b/inventory/host_vars/ns-sb01.fedoraproject.org deleted file mode 100644 index 82f976194a..0000000000 --- a/inventory/host_vars/ns-sb01.fedoraproject.org +++ /dev/null @@ -1,37 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 192.168.122.1 -dns: 8.8.8.8 - -volgroup: /dev/vg_Server -eth0_ip: 192.168.122.3 -vmhost: serverbeach09.fedoraproject.org -datacenter: serverbeach - -postfix_group: vpn - -# This uses a different virt-install due to wacky serverbeach network/setup -virt_install_command: 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 }}" - --network bridge=virbr0,model=virtio - --autostart --noautoconsole - -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/ - -# This is consumed by the roles/fedora-web/main role -sponsor: serverbeach -postfix_group: vpn - -mem_size: 6144 -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -# This is used in the httpd.conf to determine the value for serverlimit and -# maxrequestworkers. On 8gb proxies, 900 seems fine. But on 4gb proxies, this -# should be lowered in the host vars for that proxy. -maxrequestworkers: 600 diff --git a/inventory/inventory b/inventory/inventory index 1198d37755..5252c0ada1 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -114,12 +114,12 @@ internetx01.fedoraproject.org osuosl01.fedoraproject.org osuosl02.fedoraproject.org osuosl03.fedoraproject.org -serverbeach06.fedoraproject.org -serverbeach07.fedoraproject.org -serverbeach08.fedoraproject.org -serverbeach09.fedoraproject.org -serverbeach10.fedoraproject.org -#telia01.fedoraproject.org +# serverbeach06.fedoraproject.org +# serverbeach07.fedoraproject.org +# serverbeach08.fedoraproject.org +# serverbeach09.fedoraproject.org +# serverbeach10.fedoraproject.org +# telia01.fedoraproject.org tummy01.fedoraproject.org [datagrepper] @@ -475,7 +475,6 @@ ns02.fedoraproject.org ns03.phx2.fedoraproject.org ns04.phx2.fedoraproject.org ns05.fedoraproject.org -ns-sb01.fedoraproject.org [packages] packages03.phx2.fedoraproject.org diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index e303973809..4e4436516c 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars - name: make virthost server system - hosts: virthost:bvirthost:buildvmhost:virthost-comm03.qa.fedoraproject.org:virthost-comm04.qa.fedoraproject.org:ibiblio02.fedoraproject.org:ibiblio03.fedoraproject.org:ibiblio04.fedoraproject.org:ibiblio05.fedoraproject.org:coloamer01.fedoraproject.org:osuosl03.fedoraproject.org:host1plus01.fedoraproject.org:dedicatedsolutions01.fedoraproject.org:tummy01.fedoraproject.org:osuosl01.fedoraproject.org:virthost-comm02.qa.fedoraproject.org:virthost-s390.qa.fedoraproject.org:osuosl02.fedoraproject.org:serverbeach09.fedoraproject.org:virthost19.phx2.fedoraproject.org:virthost20.phx2.fedoraproject.org:virthost21.phx2.fedoraproject.org:virthost22.phx2.fedoraproject.org + hosts: virthost:bvirthost:buildvmhost:virthost-comm03.qa.fedoraproject.org:virthost-comm04.qa.fedoraproject.org:ibiblio02.fedoraproject.org:ibiblio03.fedoraproject.org:ibiblio04.fedoraproject.org:ibiblio05.fedoraproject.org:coloamer01.fedoraproject.org:osuosl03.fedoraproject.org:host1plus01.fedoraproject.org:dedicatedsolutions01.fedoraproject.org:tummy01.fedoraproject.org:osuosl01.fedoraproject.org:virthost-comm02.qa.fedoraproject.org:virthost-s390.qa.fedoraproject.org:osuosl02.fedoraproject.org:virthost19.phx2.fedoraproject.org:virthost20.phx2.fedoraproject.org:virthost21.phx2.fedoraproject.org:virthost22.phx2.fedoraproject.org user: root gather_facts: True diff --git a/roles/nagios_server/files/nagios-external/hosts/ns-sb01.cfg b/roles/nagios_server/files/nagios-external/hosts/ns-sb01.cfg index 510cafa050..13d5663a32 100644 --- a/roles/nagios_server/files/nagios-external/hosts/ns-sb01.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/ns-sb01.cfg @@ -1,14 +1,14 @@ -define host { - host_name ns-sb01 - alias ns-sb01.fedoraproject.org - use defaulttemplate - address 69.174.247.243 - parents serverbeach09.fedoraproject.org -} +# define host { +# host_name ns-sb01 +# alias ns-sb01.fedoraproject.org +# use defaulttemplate +# address 69.174.247.243 +# parents serverbeach09.fedoraproject.org +# } -define host { - host_name serverbeach09.fedoraproject.org - alias serverbeach09.fedoraproject.org - use defaulttemplate - address 66.135.39.232 -} +# define host { +# host_name serverbeach09.fedoraproject.org +# alias serverbeach09.fedoraproject.org +# use defaulttemplate +# address 66.135.39.232 +# } diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg index 43b7d174e3..960f9e294b 100644 --- a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name kvmServers alias kvmServers - members bvirthost06, bvirthost07, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost05, virthost06, virthost07, virthost08, virthost09, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, serverbeach09, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01 + members bvirthost06, bvirthost07, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost05, virthost06, virthost07, virthost08, virthost09, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 7b34d6dbef..c2d0663b3d 100644 --- a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name vpnclients alias vpnclients - members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,serverbeach09,ns-sb01,collab03,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,collab03,smtp-mm-coloamer01,host1plus01,dedicatedsolutions01,proxy05,proxy11 } diff --git a/roles/nagios_server/files/nagios/hosts/ns-sb01.cfg b/roles/nagios_server/files/nagios/hosts/ns-sb01.cfg index e40db02dcc..46a931c038 100644 --- a/roles/nagios_server/files/nagios/hosts/ns-sb01.cfg +++ b/roles/nagios_server/files/nagios/hosts/ns-sb01.cfg @@ -1,7 +1,7 @@ -define host { - host_name ns-sb01 - alias ns-sb01.fedoraproject.org - use defaulttemplate - address 69.174.247.243 - parents serverbeach09 -} +# define host { +# host_name ns-sb01 +# alias ns-sb01.fedoraproject.org +# use defaulttemplate +# address 69.174.247.243 +# parents serverbeach09 +# } diff --git a/roles/nagios_server/files/nagios/hosts/serverbeach09.cfg b/roles/nagios_server/files/nagios/hosts/serverbeach09.cfg index c1308543cc..2f8078eb09 100644 --- a/roles/nagios_server/files/nagios/hosts/serverbeach09.cfg +++ b/roles/nagios_server/files/nagios/hosts/serverbeach09.cfg @@ -1,7 +1,7 @@ -define host { - host_name serverbeach09 - alias serverbeach09.fedoraproject.org - use defaulttemplate - address serverbeach09.fedoraproject.org - parents fwsm01-gw -} +# define host { +# host_name serverbeach09 +# alias serverbeach09.fedoraproject.org +# use defaulttemplate +# address serverbeach09.fedoraproject.org +# parents fwsm01-gw +# }