From 15887191c1d2fa70e4628d0ba67042244a66a7d1 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 27 Jun 2018 20:41:34 +0000 Subject: [PATCH] and make vh20 now vh04 --- inventory/group_vars/nagios | 4 ++-- inventory/hardware | 2 +- .../host_vars/autocloud-backend01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/autosign01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org | 2 +- .../docker-candidate-registry01.stg.phx2.fedoraproject.org | 2 +- .../host_vars/docker-registry01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/fas01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org | 2 +- .../host_vars/freshmaker-backend01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/ipa01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/notifs-web02.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/odcs-backend01.stg.phx2.fedoraproject.org | 2 +- .../host_vars/odcs-frontend01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/pdc-backend01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/pdc-backend02.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/sign-bridge01.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/sign-vault01.stg.phx2.fedoraproject.org | 2 +- .../host_vars/statscache-web02.stg.phx2.fedoraproject.org | 2 +- inventory/host_vars/summershum01.stg.phx2.fedoraproject.org | 2 +- inventory/inventory | 3 ++- .../dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org | 4 ++-- 25 files changed, 28 insertions(+), 27 deletions(-) diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios index a077cfaaa4..395da296bc 100644 --- a/inventory/group_vars/nagios +++ b/inventory/group_vars/nagios @@ -114,13 +114,13 @@ phx2_management_hosts: - bvirthost01-stg.mgmt.fedoraproject.org - virthost02-stg.mgmt.fedoraproject.org - virthost06.mgmt.fedoraproject.org - - virthost11.mgmt.fedoraproject.org + - virthost03-stg.mgmt.fedoraproject.org - virthost15.mgmt.fedoraproject.org - virthost16.mgmt.fedoraproject.org - virthost17.mgmt.fedoraproject.org - virthost18.mgmt.fedoraproject.org - virthost19.mgmt.fedoraproject.org - - virthost20.mgmt.fedoraproject.org + - virthost04-stg.mgmt.fedoraproject.org - virthost21.mgmt.fedoraproject.org - virthost22.mgmt.fedoraproject.org diff --git a/inventory/hardware b/inventory/hardware index 717df5bc94..da3107143c 100644 --- a/inventory/hardware +++ b/inventory/hardware @@ -18,7 +18,7 @@ virthost16.phx2.fedoraproject.org virthost17.phx2.fedoraproject.org virthost18.phx2.fedoraproject.org virthost19.phx2.fedoraproject.org -virthost20.phx2.fedoraproject.org +virthost04.stg.phx2.fedoraproject.org virthost21.phx2.fedoraproject.org virthost22.phx2.fedoraproject.org bvirthost01.phx2.fedoraproject.org diff --git a/inventory/host_vars/autocloud-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/autocloud-backend01.stg.phx2.fedoraproject.org index 5f6a45c4fc..d11855614a 100644 --- a/inventory/host_vars/autocloud-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/autocloud-backend01.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.64 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/autosign01.stg.phx2.fedoraproject.org b/inventory/host_vars/autosign01.stg.phx2.fedoraproject.org index a47ff40aac..7827279225 100644 --- a/inventory/host_vars/autosign01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/autosign01.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_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 eth0_ip: 10.5.128.68 diff --git a/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org index b744e85ae5..0d9e906f38 100644 --- a/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org @@ -6,4 +6,4 @@ 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/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.80 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org diff --git a/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org index d3444b8e60..e833527ea2 100644 --- a/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-candidate-registry01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27-docker-reg 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.122 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 nrpe_procs_warn: 900 diff --git a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org b/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org index 2dd8fba525..351e7b0428 100644 --- a/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/docker-registry01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27-docker-reg 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.123 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 nrpe_procs_warn: 900 diff --git a/inventory/host_vars/fas01.stg.phx2.fedoraproject.org b/inventory/host_vars/fas01.stg.phx2.fedoraproject.org index e1f8875930..c70e5a77c7 100644 --- a/inventory/host_vars/fas01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/fas01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6 ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.129 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 # There's only this server in stg, so it does certs. diff --git a/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org b/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org index 76792904dd..8ea089496d 100644 --- a/inventory/host_vars/fas3-01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/fas3-01.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.130 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 nagios_Check_Services: diff --git a/inventory/host_vars/freshmaker-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/freshmaker-backend01.stg.phx2.fedoraproject.org index 128c25088d..29e60241ba 100644 --- a/inventory/host_vars/freshmaker-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/freshmaker-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.63 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/ipa01.stg.phx2.fedoraproject.org b/inventory/host_vars/ipa01.stg.phx2.fedoraproject.org index 41af685013..7e468de6e3 100644 --- a/inventory/host_vars/ipa01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/ipa01.stg.phx2.fedoraproject.org @@ -6,5 +6,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_guests eth0_ip: 10.5.128.136 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/notifs-web02.stg.phx2.fedoraproject.org b/inventory/host_vars/notifs-web02.stg.phx2.fedoraproject.org index 94e0a7a920..47f580bd81 100644 --- a/inventory/host_vars/notifs-web02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/notifs-web02.stg.phx2.fedoraproject.org @@ -9,7 +9,7 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ eth0_ip: 10.5.128.157 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/odcs-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/odcs-backend01.stg.phx2.fedoraproject.org index 0e189d2db1..a098d91356 100644 --- a/inventory/host_vars/odcs-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/odcs-backend01.stg.phx2.fedoraproject.org @@ -10,4 +10,4 @@ eth0_ip: 10.5.128.77 eth1_ip: 10.5.127.113 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org diff --git a/inventory/host_vars/odcs-frontend01.stg.phx2.fedoraproject.org b/inventory/host_vars/odcs-frontend01.stg.phx2.fedoraproject.org index fd102b514e..16d9482e4e 100644 --- a/inventory/host_vars/odcs-frontend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/odcs-frontend01.stg.phx2.fedoraproject.org @@ -9,6 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ eth0_ip: 10.5.128.76 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org index a821ed8392..b663b90184 100644 --- a/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-master01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-osbs ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.161 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 host_group: osbs-stg diff --git a/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org index 03ab4ff8d6..7e0cc6aef4 100644 --- a/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-node01.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-osbs ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.162 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 host_group: osbs-nodes-stg diff --git a/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org b/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org index 324f3b4c07..aeba0bd68c 100644 --- a/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/osbs-node02.stg.phx2.fedoraproject.org @@ -6,7 +6,7 @@ ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-28-osbs ks_repo: http://10.5.126.23/pub/fedora/linux/releases/28/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.128.163 -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 host_group: osbs-nodes-stg diff --git a/inventory/host_vars/pdc-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend01.stg.phx2.fedoraproject.org index 8db306caff..842cf49a7a 100644 --- a/inventory/host_vars/pdc-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/pdc-backend01.stg.phx2.fedoraproject.org @@ -9,7 +9,7 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ eth0_ip: 10.5.128.167 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 # These people get told when something goes wrong. diff --git a/inventory/host_vars/pdc-backend02.stg.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend02.stg.phx2.fedoraproject.org index fb8154bb67..857ca60182 100644 --- a/inventory/host_vars/pdc-backend02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/pdc-backend02.stg.phx2.fedoraproject.org @@ -9,7 +9,7 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ eth0_ip: 10.5.128.168 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 # These people get told when something goes wrong. diff --git a/inventory/host_vars/sign-bridge01.stg.phx2.fedoraproject.org b/inventory/host_vars/sign-bridge01.stg.phx2.fedoraproject.org index 31921bc805..bbcbce5e43 100644 --- a/inventory/host_vars/sign-bridge01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/sign-bridge01.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_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 eth0_ip: 10.5.128.179 diff --git a/inventory/host_vars/sign-vault01.stg.phx2.fedoraproject.org b/inventory/host_vars/sign-vault01.stg.phx2.fedoraproject.org index e729f68486..5cb1e2d744 100644 --- a/inventory/host_vars/sign-vault01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/sign-vault01.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_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 eth0_ip: 10.5.128.180 diff --git a/inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org b/inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org index 0cf5b35d86..1b1a9cf590 100644 --- a/inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/statscache-web02.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.183 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/summershum01.stg.phx2.fedoraproject.org b/inventory/host_vars/summershum01.stg.phx2.fedoraproject.org index 379171bf5e..e72c2fc0c0 100644 --- a/inventory/host_vars/summershum01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/summershum01.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.184 volgroup: /dev/vg_guests -vmhost: virthost20.phx2.fedoraproject.org +vmhost: virthost04.stg.phx2.fedoraproject.org datacenter: phx2 diff --git a/inventory/inventory b/inventory/inventory index a6ac28f15a..b0ebe6e8fd 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -811,6 +811,7 @@ bvirthost01.stg.phx2.fedoraproject.org virthost01.stg.phx2.fedoraproject.org virthost02.stg.phx2.fedoraproject.org virthost03.stg.phx2.fedoraproject.org +virthost04.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 @@ -912,6 +913,7 @@ value01.stg.phx2.fedoraproject.org virthost01.stg.phx2.fedoraproject.org virthost02.stg.phx2.fedoraproject.org virthost03.stg.phx2.fedoraproject.org +virthost04.stg.phx2.fedoraproject.org virthost01.phx2.fedoraproject.org virthost02.phx2.fedoraproject.org virthost03.phx2.fedoraproject.org @@ -923,7 +925,6 @@ virthost16.phx2.fedoraproject.org virthost17.phx2.fedoraproject.org virthost18.phx2.fedoraproject.org virthost19.phx2.fedoraproject.org -virthost20.phx2.fedoraproject.org virthost21.phx2.fedoraproject.org virthost22.phx2.fedoraproject.org qa09.qa.fedoraproject.org diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org index bdec4cae8a..8ca74dc1fa 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -378,11 +378,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 { filename "pxelinux.0"; } - host virthost20 { + host virthost04.stg { hardware ethernet EC:F4:BB:E1:CB:8C; fixed-address 10.5.126.160; next-server 10.5.126.41; - option host-name "virthost20"; + option host-name "virthost04.stg"; filename "pxelinux.0"; }