From e7c8bdc644d6d30088d6de3d6a9c075b4417cd5c Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Tue, 31 Mar 2015 01:20:45 +0000 Subject: [PATCH] updating taskotron-stg, resultsdb-stg and clients to f21, client14 to x86_64 --- .../host_vars/resultsdb-stg01.qa.fedoraproject.org | 8 ++++---- .../taskotron-client11.qa.fedoraproject.org | 4 ++-- .../taskotron-client12.qa.fedoraproject.org | 2 +- .../taskotron-client13.qa.fedoraproject.org | 4 ++-- .../taskotron-client14.qa.fedoraproject.org | 5 ++--- .../taskotron-client19.qa.fedoraproject.org | 2 +- .../taskotron-client20.qa.fedoraproject.org | 4 ++-- .../taskotron-client21.qa.fedoraproject.org | 4 ++-- .../host_vars/taskotron-stg01.qa.fedoraproject.org | 12 ++++++------ 9 files changed, 22 insertions(+), 23 deletions(-) diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org index 0849ad2c7b..99baeef30e 100644 --- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org @@ -2,9 +2,9 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ -volgroup: /dev/VirtGuests +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ +volgroup: /dev/vg_guests eth0_ip: 10.5.124.147 -vmhost: virthost-comm02.qa.fedoraproject.org +vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 diff --git a/inventory/host_vars/taskotron-client11.qa.fedoraproject.org b/inventory/host_vars/taskotron-client11.qa.fedoraproject.org index 5c1d165b69..9ec65075d7 100644 --- a/inventory/host_vars/taskotron-client11.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client11.qa.fedoraproject.org @@ -2,8 +2,8 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.169 vmhost: qa04.qa.fedoraproject.org diff --git a/inventory/host_vars/taskotron-client12.qa.fedoraproject.org b/inventory/host_vars/taskotron-client12.qa.fedoraproject.org index b51d5d4a2e..d2058568f5 100644 --- a/inventory/host_vars/taskotron-client12.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client12.qa.fedoraproject.org @@ -2,7 +2,7 @@ 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-20 +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/i386/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.170 diff --git a/inventory/host_vars/taskotron-client13.qa.fedoraproject.org b/inventory/host_vars/taskotron-client13.qa.fedoraproject.org index 1de19bad19..69a4360dee 100644 --- a/inventory/host_vars/taskotron-client13.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client13.qa.fedoraproject.org @@ -2,8 +2,8 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.192 vmhost: qa04.qa.fedoraproject.org diff --git a/inventory/host_vars/taskotron-client14.qa.fedoraproject.org b/inventory/host_vars/taskotron-client14.qa.fedoraproject.org index 4e4de3338a..71a5d0da57 100644 --- a/inventory/host_vars/taskotron-client14.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client14.qa.fedoraproject.org @@ -2,13 +2,12 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/i386/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.193 vmhost: qa04.qa.fedoraproject.org datacenter: phx2 -libdir: /usr/lib short_hostname: taskotron-client14.qa buildslave_name: taskotron-client14 diff --git a/inventory/host_vars/taskotron-client19.qa.fedoraproject.org b/inventory/host_vars/taskotron-client19.qa.fedoraproject.org index e60596aaa3..7b18f237b8 100644 --- a/inventory/host_vars/taskotron-client19.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client19.qa.fedoraproject.org @@ -2,7 +2,7 @@ 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-20 +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/i386/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.198 diff --git a/inventory/host_vars/taskotron-client20.qa.fedoraproject.org b/inventory/host_vars/taskotron-client20.qa.fedoraproject.org index cc506b210b..5fe8c6c342 100644 --- a/inventory/host_vars/taskotron-client20.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client20.qa.fedoraproject.org @@ -2,8 +2,8 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.199 vmhost: qa05.qa.fedoraproject.org diff --git a/inventory/host_vars/taskotron-client21.qa.fedoraproject.org b/inventory/host_vars/taskotron-client21.qa.fedoraproject.org index e381b3d5cc..05d09c5f69 100644 --- a/inventory/host_vars/taskotron-client21.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-client21.qa.fedoraproject.org @@ -2,8 +2,8 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ volgroup: /dev/vmstore eth0_ip: 10.5.124.200 vmhost: qa05.qa.fedoraproject.org diff --git a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org index 5ec969b01f..68c28338f8 100644 --- a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org @@ -2,17 +2,17 @@ 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-20 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ -volgroup: /dev/Guests00 +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21-taskotron-master +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ +volgroup: /dev/vg_guests eth0_ip: 10.5.124.232 -vmhost: virthost-comm01.qa.fedoraproject.org +vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 fas_client_groups: sysadmin-qa,sysadmin-main # default virt install command is for a single nic-device # define in another group file for more nics (see buildvm) -virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} +virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }} -l {{ ks_repo }} -x "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} @@ -33,10 +33,10 @@ buildslaves: - taskotron-client21 i386_buildslaves: - taskotron-client12 - - taskotron-client14 - taskotron-client19 x86_64_buildslaves: - taskotron-client11 - taskotron-client13 + - taskotron-client14 - taskotron-client20 - taskotron-client21