diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index 57a3209293..a077cfaaa4 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -112,7 +112,7 @@ phx2_management_hosts: - virthost02.mgmt.fedoraproject.org - virthost03.mgmt.fedoraproject.org - bvirthost01-stg.mgmt.fedoraproject.org - - virthost05.mgmt.fedoraproject.org + - virthost02-stg.mgmt.fedoraproject.org - virthost06.mgmt.fedoraproject.org - virthost11.mgmt.fedoraproject.org - virthost15.mgmt.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index 9632287ad8..da18325f72 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -9,7 +9,7 @@ virthost01.phx2.fedoraproject.org virthost02.phx2.fedoraproject.org virthost03.phx2.fedoraproject.org bvirthost01.stg.phx2.fedoraproject.org -virthost05.phx2.fedoraproject.org +virthost02.stg.phx2.fedoraproject.org virthost11.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org virthost14.phx2.fedoraproject.org diff --git a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org index a12c59dd14..45043e2e18 100644 --- a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org @@ -8,7 +8,7 @@ volgroup: /dev/vg_guests virt_install_command: "{{ virt_install_command_two_nic }}" eth0_ip: 10.5.128.79 eth1_ip: 10.5.127.65 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org index 0fc3791df2..42fdfaba38 100644 --- a/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org +++ b/inventory/host_vars/compose-x86-02.phx2.fedoraproject.org @@ -19,7 +19,7 @@ volgroup: /dev/vg_guests eth0_ip: 10.5.125.42 eth1_ip: 10.5.127.27 eth1_gw: 10.5.127.254 -vmhost: bvirthost05.phx2.fedoraproject.org +vmhost: bvirthost02.stg.phx2.fedoraproject.org datacenter: phx2 fas_client_groups: sysadmin-releng diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org index d0a781cef2..976b3bceae 100644 --- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org +++ b/inventory/host_vars/db-koji01.phx2.fedoraproject.org @@ -4,7 +4,7 @@ gw: 10.5.125.254 dns: 10.5.126.21 volgroup: /dev/vg_guests eth0_ip: 10.5.125.47 -vmhost: bvirthost05.phx2.fedoraproject.org +vmhost: bvirthost02.stg.phx2.fedoraproject.org datacenter: phx2 ks_url: http://infrastructure.phx2.fedoraproject.org/repo/rhel/ks/kvm-rhel-7 diff --git a/inventory/host_vars/hubs01.stg.phx2.fedoraproject.org b/inventory/host_vars/hubs01.stg.phx2.fedoraproject.org index e242461907..9916681357 100644 --- a/inventory/host_vars/hubs01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/hubs01.stg.phx2.fedoraproject.org @@ -8,5 +8,5 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.190 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/os-control01.stg.phx2.fedoraproject.org b/inventory/host_vars/os-control01.stg.phx2.fedoraproject.org index 3b03e4fc07..67778065d7 100644 --- a/inventory/host_vars/os-control01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/os-control01.stg.phx2.fedoraproject.org @@ -8,7 +8,7 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.100 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 lvm_size: 100g diff --git a/inventory/host_vars/os-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/os-master01.stg.phx2.fedoraproject.org index dd6e71fda8..a01630fbdb 100644 --- a/inventory/host_vars/os-master01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/os-master01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.101 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 host_group: os-stg diff --git a/inventory/host_vars/os-master02.stg.phx2.fedoraproject.org b/inventory/host_vars/os-master02.stg.phx2.fedoraproject.org index 50d23e80c5..a2b3da571f 100644 --- a/inventory/host_vars/os-master02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/os-master02.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.102 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 host_group: os-stg diff --git a/inventory/host_vars/os-master03.stg.phx2.fedoraproject.org b/inventory/host_vars/os-master03.stg.phx2.fedoraproject.org index 2b73766654..52bbb574cc 100644 --- a/inventory/host_vars/os-master03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/os-master03.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.103 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 host_group: os-stg diff --git a/inventory/host_vars/os-node01.stg.phx2.fedoraproject.org b/inventory/host_vars/os-node01.stg.phx2.fedoraproject.org index afe3eb5b63..ecbf068b7f 100644 --- a/inventory/host_vars/os-node01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/os-node01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.104 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 nrpe_procs_warn: 900 diff --git a/inventory/host_vars/os-node02.stg.phx2.fedoraproject.org b/inventory/host_vars/os-node02.stg.phx2.fedoraproject.org index 50d957221c..3b388e298c 100644 --- a/inventory/host_vars/os-node02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/os-node02.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7-osbs ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.105 -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org datacenter: phx2 nrpe_procs_warn: 900 diff --git a/inventory/host_vars/proxy01.stg.phx2.fedoraproject.org b/inventory/host_vars/proxy01.stg.phx2.fedoraproject.org index fb59ed342e..a134770a47 100644 --- a/inventory/host_vars/proxy01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ -vmhost: virthost05.phx2.fedoraproject.org +vmhost: virthost02.stg.phx2.fedoraproject.org volgroup: /dev/vg_guests eth0_ip: 10.5.128.177 diff --git a/inventory/inventory b/inventory/inventory index 0a2cfc6da9..4fec69e3ce 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -809,6 +809,7 @@ taskotron-stg01.qa.fedoraproject.org value01.stg.phx2.fedoraproject.org bvirthost01.stg.phx2.fedoraproject.org virthost01.stg.phx2.fedoraproject.org +virthost02.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 @@ -908,10 +909,10 @@ value01.stg.phx2.fedoraproject.org [virthost] virthost01.stg.phx2.fedoraproject.org +virthost02.stg.phx2.fedoraproject.org virthost01.phx2.fedoraproject.org virthost02.phx2.fedoraproject.org virthost03.phx2.fedoraproject.org -virthost05.phx2.fedoraproject.org virthost06.phx2.fedoraproject.org virthost11.phx2.fedoraproject.org virthost12.phx2.fedoraproject.org