diff --git a/inventory/inventory b/inventory/inventory index 3e933bcb81..eedf30d674 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -230,11 +230,9 @@ autocloud-backend-libvirt autocloud-backend-vbox [autocloud-backend-libvirt] -autocloud-backend01.phx2.fedoraproject.org autocloud-backend-libvirt.phx2.fedoraproject.org [autocloud-backend-vbox] -autocloud-backend02.phx2.fedoraproject.org autocloud-backend-vbox.phx2.fedoraproject.org [autocloud-backend-stg:children] diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index caa948994a..bb00379623 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/playbooks/groups/autocloud-backend.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend01.phx2.fedoraproject.org:autocloud-backend-stg" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend-stg" - name: dole out the generic configuration hosts: autocloud-backend;autocloud-backend-stg diff --git a/playbooks/manual/upgrade/autocloud.yml b/playbooks/manual/upgrade/autocloud.yml index 2b46bd203e..c7bfa93074 100644 --- a/playbooks/manual/upgrade/autocloud.yml +++ b/playbooks/manual/upgrade/autocloud.yml @@ -93,7 +93,7 @@ # command: /usr/bin/alembic -c /usr/share/autocloud/alembic.ini upgrade head # args: # chdir: /usr/share/autocloud/ - # when: inventory_hostname.startswith('autocloud-backend01') + # when: inventory_hostname.startswith('autocloud-backend-libvirt') - name: And... start the autocloud backend again service: name="autocloud" state=started 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 d21a5d8e5d..5d4d3bf896 100644 --- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org +++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org @@ -21,11 +21,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 { option host-name "virthost02"; } - host autocloud-backend02 { + host autocloud-backend-vbox { hardware ethernet e4:1f:13:ba:84:d0; fixed-address 10.5.126.122; next-server 10.5.126.41; - option host-name "autocloud-backend02"; + option host-name "autocloud-backend-vbox"; filename "pxelinux.0"; } diff --git a/roles/nagios_server/files/nagios/hosts/autocloud-backend01.cfg b/roles/nagios_server/files/nagios/hosts/autocloud-backend01.cfg index e0a0e034e8..9b3c6e9b36 100644 --- a/roles/nagios_server/files/nagios/hosts/autocloud-backend01.cfg +++ b/roles/nagios_server/files/nagios/hosts/autocloud-backend01.cfg @@ -1,6 +1,6 @@ define host { - host_name autocloud-backend01 - alias autocloud-backend01.phx2.fedoraproject.org + host_name autocloud-backend-libvirt + alias autocloud-backend-libvirt.phx2.fedoraproject.org use defaulttemplate - address autocloud-backend01.phx2.fedoraproject.org + address autocloud-backend-libvirt.phx2.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/hosts/autocloud-backend02.cfg b/roles/nagios_server/files/nagios/hosts/autocloud-backend02.cfg index 7c56183f08..013dea6199 100644 --- a/roles/nagios_server/files/nagios/hosts/autocloud-backend02.cfg +++ b/roles/nagios_server/files/nagios/hosts/autocloud-backend02.cfg @@ -1,6 +1,6 @@ define host { - host_name autocloud-backend02 - alias autocloud-backend02.phx2.fedoraproject.org + host_name autocloud-backend-vbox + alias autocloud-backend-vbox.phx2.fedoraproject.org use defaulttemplate - address autocloud-backend02.phx2.fedoraproject.org + address autocloud-backend-vbox.phx2.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios/services/autocloud.cfg b/roles/nagios_server/files/nagios/services/autocloud.cfg index 80da5823bb..dd99b3b4db 100644 --- a/roles/nagios_server/files/nagios/services/autocloud.cfg +++ b/roles/nagios_server/files/nagios/services/autocloud.cfg @@ -1,12 +1,12 @@ define service { - host_name autocloud-backend01,autocloud-backend02 + host_name autocloud-backend-libvirt,autocloud-backend-vbox service_description Check for autocloud proc check_command check_by_nrpe!check_autocloud_proc use defaulttemplate } define service { - host_name autocloud-backend01,autocloud-backend02 + host_name autocloud-backend-libvirt,autocloud-backend-vbox service_description Check for redis proc check_command check_by_nrpe!check_redis_proc use defaulttemplate diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg index 3cc2cde24f..f01bfe9989 100644 --- a/roles/nagios_server/files/nagios/services/fedmsg.cfg +++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg @@ -101,7 +101,7 @@ define service { use defaulttemplate } define service { - host_name autocloud-backend01,autocloud-backend02 + host_name autocloud-backend-libvirt,autocloud-backend-vbox service_description Check for fedmsg-hub proc check_command check_by_nrpe!check_fedmsg_hub_proc use defaulttemplate @@ -407,7 +407,7 @@ define service { } define service { - host_name autocloud-backend01,autocloud-backend02 + host_name autocloud-backend-libvirt,autocloud-backend-vbox service_description Check fedmsg consumers and producers hub check_command check_by_nrpe!check_fedmsg_cp_autocloud_backend use defaulttemplate @@ -521,7 +521,7 @@ define service { } define service { - host_name autocloud-backend01,autocloud-backend02 + host_name autocloud-backend-libvirt,autocloud-backend-vbox service_description Check fedmsg-hub consumers exceptions check_command check_by_nrpe!check_fedmsg_cexceptions_autocloud_backend use defaulttemplate @@ -635,7 +635,7 @@ define service { } define service { - host_name autocloud-backend01,autocloud-backend02 + host_name autocloud-backend-libvirt,autocloud-backend-vbox service_description Check fedmsg-hub consumers backlog check_command check_by_nrpe!check_fedmsg_cbacklog_autocloud_backend use defaulttemplate