diff --git a/inventory/host_vars/taskotron-client11.qa.fedoraproject.org b/inventory/host_vars/taskotron-client11.qa.fedoraproject.org deleted file mode 100644 index aad3371a0f..0000000000 --- a/inventory/host_vars/taskotron-client11.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.169 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client11.qa -buildslave_name: taskotron-client11 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client12.qa.fedoraproject.org b/inventory/host_vars/taskotron-client12.qa.fedoraproject.org deleted file mode 100644 index ab92f82ff4..0000000000 --- a/inventory/host_vars/taskotron-client12.qa.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/i386/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.170 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 -libdir: /usr/lib - -# don't know why this is required, should be the same as x86_64 -lvm_size: 25000 - -short_hostname: taskotron-client12.qa -buildslave_name: taskotron-client12 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client13.qa.fedoraproject.org b/inventory/host_vars/taskotron-client13.qa.fedoraproject.org deleted file mode 100644 index dac8749cf7..0000000000 --- a/inventory/host_vars/taskotron-client13.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.192 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client13.qa -buildslave_name: taskotron-client13 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client14.qa.fedoraproject.org b/inventory/host_vars/taskotron-client14.qa.fedoraproject.org deleted file mode 100644 index e1370c4ae9..0000000000 --- a/inventory/host_vars/taskotron-client14.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.193 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client14.qa -buildslave_name: taskotron-client14 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client19.qa.fedoraproject.org b/inventory/host_vars/taskotron-client19.qa.fedoraproject.org deleted file mode 100644 index 80c0b8a660..0000000000 --- a/inventory/host_vars/taskotron-client19.qa.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/i386/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.198 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 -libdir: /usr/lib - -# don't know why this is required, should be the same as x86_64 -lvm_size: 25000 - -short_hostname: taskotron-client19.qa -buildslave_name: taskotron-client19 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client20.qa.fedoraproject.org b/inventory/host_vars/taskotron-client20.qa.fedoraproject.org deleted file mode 100644 index bba15e32cc..0000000000 --- a/inventory/host_vars/taskotron-client20.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.199 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client20.qa -buildslave_name: taskotron-client20 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client21.qa.fedoraproject.org b/inventory/host_vars/taskotron-client21.qa.fedoraproject.org deleted file mode 100644 index 66ba8d4335..0000000000 --- a/inventory/host_vars/taskotron-client21.qa.fedoraproject.org +++ /dev/null @@ -1,14 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.200 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client21.qa -buildslave_name: taskotron-client21 -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client26.qa.fedoraproject.org b/inventory/host_vars/taskotron-client26.qa.fedoraproject.org deleted file mode 100644 index d9cf621c50..0000000000 --- a/inventory/host_vars/taskotron-client26.qa.fedoraproject.org +++ /dev/null @@ -1,16 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.187 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client26.qa -slaves: - - { user: taskotron-client26-1, home: /home/taskotron-client26-1, dir: /home/taskotron-client26-1/slave } - - { user: taskotron-client26-2, home: /home/taskotron-client26-2, dir: /home/taskotron-client26-2/slave } -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client27.qa.fedoraproject.org b/inventory/host_vars/taskotron-client27.qa.fedoraproject.org deleted file mode 100644 index 09a226cdc8..0000000000 --- a/inventory/host_vars/taskotron-client27.qa.fedoraproject.org +++ /dev/null @@ -1,18 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.188 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 -# if this is a 32bit instance -#libdir: /usr/lib - -short_hostname: taskotron-client27.qa -slaves: - - { user: taskotron-client27-1, home: /home/taskotron-client27-1, dir: /home/taskotron-client27-1/slave } - - { user: taskotron-client27-2, home: /home/taskotron-client27-2, dir: /home/taskotron-client27-2/slave } -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client28.qa.fedoraproject.org b/inventory/host_vars/taskotron-client28.qa.fedoraproject.org deleted file mode 100644 index 3cb0f53819..0000000000 --- a/inventory/host_vars/taskotron-client28.qa.fedoraproject.org +++ /dev/null @@ -1,16 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.189 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 - -short_hostname: taskotron-client28.qa -slaves: - - { user: taskotron-client28-1, home: /home/taskotron-client28-1, dir: /home/taskotron-client28-1/slave } - - { user: taskotron-client28-2, home: /home/taskotron-client28-2, dir: /home/taskotron-client28-2/slave } -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/host_vars/taskotron-client29.qa.fedoraproject.org b/inventory/host_vars/taskotron-client29.qa.fedoraproject.org deleted file mode 100644 index 85997f4c98..0000000000 --- a/inventory/host_vars/taskotron-client29.qa.fedoraproject.org +++ /dev/null @@ -1,17 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.124.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/i386/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.124.190 -vmhost: qa10.qa.fedoraproject.org -datacenter: phx2 -libdir: /usr/lib - -short_hostname: taskotron-client29.qa -slaves: - - { user: taskotron-client29-1, home: /home/taskotron-client29-1, dir: /home/taskotron-client29-1/slave } - - { user: taskotron-client29-2, home: /home/taskotron-client29-2, dir: /home/taskotron-client29-2/slave } -fas_client_groups: sysadmin-qa,sysadmin-main diff --git a/inventory/inventory b/inventory/inventory index 62783e7dc9..580bb4a054 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -707,27 +707,12 @@ taskotron-prod [taskotron-dev] taskotron-dev01.qa.fedoraproject.org -[taskotron-dev-clients] -taskotron-client26.qa.fedoraproject.org -taskotron-client27.qa.fedoraproject.org -taskotron-client28.qa.fedoraproject.org -taskotron-client29.qa.fedoraproject.org - [taskotron-dev-client-hosts] qa11.qa.fedoraproject.org [taskotron-stg] taskotron-stg01.qa.fedoraproject.org -[taskotron-stg-clients] -taskotron-client11.qa.fedoraproject.org -taskotron-client12.qa.fedoraproject.org -taskotron-client13.qa.fedoraproject.org -taskotron-client14.qa.fedoraproject.org -taskotron-client19.qa.fedoraproject.org -taskotron-client20.qa.fedoraproject.org -taskotron-client21.qa.fedoraproject.org - [taskotron-stg-client-hosts] qa10.qa.fedoraproject.org