diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index 395da296bc..ad43176804 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -116,7 +116,7 @@ phx2_management_hosts: - virthost06.mgmt.fedoraproject.org - virthost03-stg.mgmt.fedoraproject.org - virthost15.mgmt.fedoraproject.org - - virthost16.mgmt.fedoraproject.org + - virthost05-stg.mgmt.fedoraproject.org - virthost17.mgmt.fedoraproject.org - virthost18.mgmt.fedoraproject.org - virthost19.mgmt.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index da3107143c..7b9f603369 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -4,30 +4,30 @@ download02.phx2.fedoraproject.org download03.phx2.fedoraproject.org download04.phx2.fedoraproject.org download05.phx2.fedoraproject.org -virthost01.stg.phx2.fedoraproject.org -virthost01.phx2.fedoraproject.org -virthost02.phx2.fedoraproject.org -virthost03.phx2.fedoraproject.org -bvirthost01.stg.phx2.fedoraproject.org -virthost02.stg.phx2.fedoraproject.org -virthost03.stg.phx2.fedoraproject.org -virthost12.phx2.fedoraproject.org -virthost14.phx2.fedoraproject.org -virthost15.phx2.fedoraproject.org -virthost16.phx2.fedoraproject.org -virthost17.phx2.fedoraproject.org -virthost18.phx2.fedoraproject.org -virthost19.phx2.fedoraproject.org -virthost04.stg.phx2.fedoraproject.org -virthost21.phx2.fedoraproject.org -virthost22.phx2.fedoraproject.org bvirthost01.phx2.fedoraproject.org +bvirthost01.stg.phx2.fedoraproject.org bvirthost04.phx2.fedoraproject.org bvirthost05.phx2.fedoraproject.org bvirthost12.phx2.fedoraproject.org bvirthost13.phx2.fedoraproject.org bvirthost14.phx2.fedoraproject.org bvirthost15.phx2.fedoraproject.org +virthost01.phx2.fedoraproject.org +virthost01.stg.phx2.fedoraproject.org +virthost02.phx2.fedoraproject.org +virthost02.stg.phx2.fedoraproject.org +virthost03.phx2.fedoraproject.org +virthost03.stg.phx2.fedoraproject.org +virthost04.stg.phx2.fedoraproject.org +virthost05.stg.phx2.fedoraproject.org +virthost12.phx2.fedoraproject.org +virthost14.phx2.fedoraproject.org +virthost15.phx2.fedoraproject.org +virthost17.phx2.fedoraproject.org +virthost18.phx2.fedoraproject.org +virthost19.phx2.fedoraproject.org +virthost21.phx2.fedoraproject.org +virthost22.phx2.fedoraproject.org ibiblio01.fedoraproject.org ibiblio04.fedoraproject.org ibiblio05.fedoraproject.org diff --git a/inventory/host_vars/autocloud-backend02.stg.phx2.fedoraproject.org b/inventory/host_vars/autocloud-backend02.stg.phx2.fedoraproject.org index 8bf6c83c4a..9e409d5aa2 100644 --- a/inventory/host_vars/autocloud-backend02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/autocloud-backend02.stg.phx2.fedoraproject.org @@ -9,7 +9,7 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ eth0_ip: 10.5.128.65 volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org b/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org index 1c1715482f..477e854fa5 100644 --- a/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org @@ -9,6 +9,6 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ eth0_ip: 10.5.128.88 volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org index 9a33ea1bd6..49bce70814 100644 --- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org @@ -8,7 +8,7 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_virthost16 eth0_ip: 10.5.128.89 eth1_ip: 10.5.127.29 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: staging fas_client_groups: sysadmin-releng,sysadmin-fedimg,modularity-wg,pungi-devel diff --git a/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org index 555fe3df3c..80c0e0e5b9 100644 --- a/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org @@ -4,7 +4,7 @@ gw: 10.5.128.254 dns: 10.5.126.21 volgroup: /dev/vg_virthost16 eth0_ip: 10.5.128.96 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 diff --git a/inventory/host_vars/db01.stg.phx2.fedoraproject.org b/inventory/host_vars/db01.stg.phx2.fedoraproject.org index 9d36e44509..e1d7ddd8e2 100644 --- a/inventory/host_vars/db01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ eth0_ip: 10.5.128.120 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 # This is a generic list, monitored by collectd diff --git a/inventory/host_vars/github2fedmsg01.stg.phx2.fedoraproject.org b/inventory/host_vars/github2fedmsg01.stg.phx2.fedoraproject.org index 9b7c82817f..033237fc89 100644 --- a/inventory/host_vars/github2fedmsg01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/github2fedmsg01.stg.phx2.fedoraproject.org @@ -1,11 +1,11 @@ ---- +y--- nm: 255.255.255.0 gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_virthost16 +volgroup: /dev/vg_guests vmhost: virthost01.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org b/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org index 1db460b364..85bf676488 100644 --- a/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/kerneltest01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 eth0_ip: 10.5.128.138 diff --git a/inventory/host_vars/mirrorlist-phx2.stg.phx2.fedoraproject.org b/inventory/host_vars/mirrorlist-phx2.stg.phx2.fedoraproject.org index 9a870563dc..fca101118b 100644 --- a/inventory/host_vars/mirrorlist-phx2.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mirrorlist-phx2.stg.phx2.fedoraproject.org @@ -9,5 +9,5 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost16 eth0_ip: 10.5.128.149 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org index fe45b3c88f..e8014e87a6 100644 --- a/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org @@ -10,7 +10,7 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost16 eth0_ip: 10.5.128.150 eth1_ip: 10.5.127.26 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 # nfs mount options, overrides the all/default diff --git a/inventory/host_vars/noc01.stg.phx2.fedoraproject.org b/inventory/host_vars/noc01.stg.phx2.fedoraproject.org index 85de88c7f0..584b8e808a 100644 --- a/inventory/host_vars/noc01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/noc01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 tcp_ports: ['22', '80', '443', '67', '68'] diff --git a/inventory/host_vars/notifs-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/notifs-backend01.stg.phx2.fedoraproject.org index 84eef7ba52..8692dd35c0 100644 --- a/inventory/host_vars/notifs-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/notifs-backend01.stg.phx2.fedoraproject.org @@ -9,6 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ eth0_ip: 10.5.128.155 volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org b/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org index 6eb683f6cf..b49f29325e 100644 --- a/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/pkgs01.stg.phx2.fedoraproject.org @@ -7,7 +7,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 ssh_hostnames: diff --git a/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org index 040362555f..6634e7371b 100644 --- a/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org @@ -9,6 +9,6 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ eth0_ip: 10.5.128.181 volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +vmhost: virthost05.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/inventory b/inventory/inventory index b0ebe6e8fd..9e678977cc 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -812,6 +812,7 @@ virthost01.stg.phx2.fedoraproject.org virthost02.stg.phx2.fedoraproject.org virthost03.stg.phx2.fedoraproject.org virthost04.stg.phx2.fedoraproject.org +virthost05.stg.phx2.fedoraproject.org wiki01.stg.phx2.fedoraproject.org zanata2fedmsg01.stg.phx2.fedoraproject.org # We know it's marked as a dev node but it simplifies things @@ -914,6 +915,7 @@ virthost01.stg.phx2.fedoraproject.org virthost02.stg.phx2.fedoraproject.org virthost03.stg.phx2.fedoraproject.org virthost04.stg.phx2.fedoraproject.org +virthost05.stg.phx2.fedoraproject.org virthost01.phx2.fedoraproject.org virthost02.phx2.fedoraproject.org virthost03.phx2.fedoraproject.org @@ -921,7 +923,6 @@ virthost06.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org virthost14.phx2.fedoraproject.org virthost15.phx2.fedoraproject.org -virthost16.phx2.fedoraproject.org virthost17.phx2.fedoraproject.org virthost18.phx2.fedoraproject.org virthost19.phx2.fedoraproject.org