diff --git a/inventory/backups b/inventory/backups index f3d996d8bb..b405b27bf6 100644 --- a/inventory/backups +++ b/inventory/backups @@ -12,7 +12,7 @@ hosted-lists01.fedoraproject.org batcave01.phx2.fedoraproject.org infinote.fedoraproject.org pagure01.fedoraproject.org -people01.fedoraproject.org +people02.fedoraproject.org pkgs02.phx2.fedoraproject.org log01.phx2.fedoraproject.org qadevel.qa.fedoraproject.org:222 diff --git a/inventory/host_vars/people01.fedoraproject.org b/inventory/host_vars/people01.fedoraproject.org deleted file mode 100644 index d31d2f4131..0000000000 --- a/inventory/host_vars/people01.fedoraproject.org +++ /dev/null @@ -1,32 +0,0 @@ ---- -freezes: false -#host_backup_targets: ['/srv/web'] - -nm: 255.255.255.128 -gw: 152.19.134.129 -dns: 8.8.8.8 -volgroup: /dev/vg_guests -eth0_ip: 152.19.134.196 -eth0_nm: 255.255.255.128 -has_ipv6: yes -eth0_ipv6: "2610:28:3090:3001:5054:ff:feff:683f" -eth0_ipv6_gw: "2610:28:3090:3001::1" - -ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-people -ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ -postfix_group: vpn -vmhost: ibiblio03.fedoraproject.org -datacenter: ibiblio - -fedmsg_fqdn: people01.vpn.fedoraproject.org - -tcp_ports: [80, 443, 9418, 873] - -nrpe_procs_warn: 900 -nrpe_procs_crit: 1000 - -lvm_size: 1t -mem_size: 8192 -num_cpus: 4 - -rsyncd_conf: "rsyncd.conf.people01.fedoraproject.org" diff --git a/inventory/inventory b/inventory/inventory index 85f46af816..67b01bd0f8 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -467,7 +467,6 @@ mm-backend-stg mm-crawler-stg [people] -people01.fedoraproject.org people02.fedoraproject.org [torrent] @@ -1027,7 +1026,7 @@ bkernel buildvmhost [groupc] -people01.fedoraproject.org +people02.fedoraproject.org [virtservers:children] colo-virt diff --git a/playbooks/run_fasClient.yml b/playbooks/run_fasClient.yml index 5f8886117f..4b058305f8 100644 --- a/playbooks/run_fasClient.yml +++ b/playbooks/run_fasClient.yml @@ -15,7 +15,7 @@ when: inventory_hostname_short.startswith('bastion0') - name: run fasClient on people and hosted and pkgs first as these are the ones most people want updated - hosts: people01.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org + hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/run_fasClient_simple.yml b/playbooks/run_fasClient_simple.yml index c81f16ddd4..25caafb380 100644 --- a/playbooks/run_fasClient_simple.yml +++ b/playbooks/run_fasClient_simple.yml @@ -14,7 +14,7 @@ ignore_errors: true - name: run fasClient on people and hosted and pkgs first as these are the ones most people want updated - hosts: people01.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org + hosts: people02.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org user: root gather_facts: False diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 1b958d23a3..543ade4a5e 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -79,7 +79,7 @@ syncHttpLogs blockerbugs01.stg.phx2.fedoraproject.org syncHttpLogs value01.phx2.fedoraproject.org syncHttpLogs secondary01 syncHttpLogs hosted03.vpn.fedoraproject.org old -syncHttpLogs people01.vpn.fedoraproject.org old +syncHttpLogs people02.vpn.fedoraproject.org old syncHttpLogs noc01.phx2.fedoraproject.org syncHttpLogs download01.phx2.fedoraproject.org syncHttpLogs download02.phx2.fedoraproject.org diff --git a/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg b/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg index 9e48874383..193cc83b8c 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg @@ -1,8 +1,8 @@ define host { - host_name 152.19.134.196-people01 - alias 152.19.134.196-people01 + host_name 152.19.134.199-people02 + alias 152.19.134.199-people02 use defaulttemplate - address 152.19.134.196 + address 152.19.134.199 parents ibiblio03.fedoraproject.org } @@ -14,8 +14,8 @@ define host { } define host { - host_name ipv6-people01 - alias ipv6-people01 + host_name ipv6-people02 + alias ipv6-people02 use defaulttemplate - address 2610:28:3090:3001:5054:ff:feff:683f + address 2610:28:3090:3001:5054:ff:fea7:9474 } diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index 999fed460e..b4df00d057 100644 --- a/roles/nagios_server/files/nagios-external/services/websites.cfg +++ b/roles/nagios_server/files/nagios-external/services/websites.cfg @@ -171,7 +171,7 @@ define service { } define service { - host_name 152.19.134.196-people01 + host_name 152.19.134.199-people02 service_description planet check_command check_website!fedoraplanet.org!/!Sub-Project planets use websitetemplate diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index 2fa384fd9d..d98a93ffe0 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,osuosl02,proxy09,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 + members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,osuosl02,proxy09,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 } diff --git a/roles/nagios_server/files/nagios/hosts/people01.cfg b/roles/nagios_server/files/nagios/hosts/people01.cfg index c864407cc0..9b842c8a8a 100644 --- a/roles/nagios_server/files/nagios/hosts/people01.cfg +++ b/roles/nagios_server/files/nagios/hosts/people01.cfg @@ -1,7 +1,7 @@ -define host { - host_name people01 - alias people01.fedoraproject.org - use defaulttemplate - address people01.fedoraproject.org - parents ibiblio03 -} +#define host { +# host_name people01 +# alias people01.fedoraproject.org +# use defaulttemplate +# address people01.fedoraproject.org +# parents ibiblio03 +#} diff --git a/roles/nagios_server/files/nagios/hosts/people02.cfg b/roles/nagios_server/files/nagios/hosts/people02.cfg new file mode 100644 index 0000000000..22211bab33 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/people02.cfg @@ -0,0 +1,7 @@ +define host { + host_name people02 + alias people02.fedoraproject.org + use defaulttemplate + address people02.fedoraproject.org + parents ibiblio05 +}