From 27bb6a4cc1e452712bc77a5337752ee3fdb588e3 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Fri, 8 May 2015 20:31:30 +0000
Subject: [PATCH] setting up virt and baremetal clients for beaker-stg

---
 inventory/host_vars/qa02.qa.fedoraproject.org | 10 +++
 .../dhcpd.conf.noc01.phx2.fedoraproject.org   | 84 +++++++++++--------
 .../dhcpd.conf.noc03.phx2.fedoraproject.org   | 40 ++++++---
 3 files changed, 86 insertions(+), 48 deletions(-)

diff --git a/inventory/host_vars/qa02.qa.fedoraproject.org b/inventory/host_vars/qa02.qa.fedoraproject.org
index b2d63f135a..8eda2760a6 100644
--- a/inventory/host_vars/qa02.qa.fedoraproject.org
+++ b/inventory/host_vars/qa02.qa.fedoraproject.org
@@ -22,4 +22,14 @@ clients:
     memsize: 4096
     num_cpus: 2
     lvm_size: 20G
+  - hostname: virt03.qa.fedoraproject.org
+    macaddress: "52:54:00:c5:04:14"
+    memsize: 4096
+    num_cpus: 2
+    lvm_size: 20G
+  - hostname: virt04.qa.fedoraproject.org
+    macaddress: "52:54:00:b5:97:30"
+    memsize: 4096
+    num_cpus: 2
+    lvm_size: 20G
 
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 0b46046521..e45524a1c3 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -1496,6 +1496,10 @@ shared-network qa {
         host qa03 {
              hardware ethernet 00:21:5E:C6:CD:48;
              fixed-address 10.5.124.153;
+             option host-name "qa03";
+             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+             next-server 10.5.124.141;
+             filename "pxelinux.0";
         }
 
         host qa04 {
@@ -1533,47 +1537,55 @@ shared-network qa {
 	     fixed-address 10.5.124.209;
         }
 
-        host virt01 {
-	     hardware ethernet 52:54:00:a2:de:30;
-	     fixed-address 10.5.124.159;
-             option host-name "virt01";
-             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        }
+    host virt01 {
+     hardware ethernet 52:54:00:a2:de:30;
+     fixed-address 10.5.124.159;
+        option host-name "virt01";
+        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
+    }
 
-        host virt02 {
-	     hardware ethernet 52:54:00:fe:22:ff;
-	     fixed-address 10.5.124.160;
-             option host-name "virt02";
-             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        }
+    host virt02 {
+     hardware ethernet 52:54:00:fe:22:ff;
+     fixed-address 10.5.124.160;
+        option host-name "virt02";
+        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
+    }
 
-        host virt03 {
-	     hardware ethernet 52:54:00:c5:04:14;
-	     fixed-address 10.5.124.161;
-             option host-name "virt03";
-             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        }
+    host virt03 {
+     hardware ethernet 52:54:00:c5:04:14;
+     fixed-address 10.5.124.161;
+        option host-name "virt03";
+        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
+    }
 
-        host virt04 {
-	     hardware ethernet 52:54:00:b5:97:30;
-	     fixed-address 10.5.124.162;
-             option host-name "virt04";
-             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        }
+    host virt04 {
+     hardware ethernet 52:54:00:b5:97:30;
+     fixed-address 10.5.124.162;
+        option host-name "virt04";
+        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
+    }
 
-        host virt05 {
-	     hardware ethernet 52:54:00:9a:25:d3;
-	     fixed-address 10.5.124.163;
-             option host-name "virt05";
-             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        }
+    host virt05 {
+     hardware ethernet 52:54:00:9a:25:d3;
+     fixed-address 10.5.124.163;
+        option host-name "virt05";
+        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+    }
 
-        host virt06 {
-	     hardware ethernet 52:54:00:78:ae:44;
-	     fixed-address 10.5.124.164;
-             option host-name "virt06";
-             option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        }
+    host virt06 {
+     hardware ethernet 52:54:00:78:ae:44;
+     fixed-address 10.5.124.164;
+        option host-name "virt06";
+        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+    }
 
     host taskotron-client07 {
 	hardware ethernet 52:54:00:00:eb:e9;
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
index 46935ee849..2a7dbb0391 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
@@ -350,8 +350,12 @@ subnet 10.5.124.128 netmask 255.255.255.128 {
 
 
     host qa01 {
-        hardware ethernet 00:21:5E:C7:5C:84;
-        fixed-address 10.5.124.151;
+         hardware ethernet 00:21:5E:C7:5C:84;
+          fixed-address 10.5.124.151;
+          option host-name "qa01";
+          option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+          next-server 10.5.124.228;
+          filename "pxelinux.0";
     }
 
     host qa02 {
@@ -360,8 +364,12 @@ subnet 10.5.124.128 netmask 255.255.255.128 {
     }
 
     host qa03 {
-        hardware ethernet 00:21:5E:C6:CD:48;
-        fixed-address 10.5.124.153;
+         hardware ethernet 00:21:5E:C6:CD:48;
+         fixed-address 10.5.124.153;
+         option host-name "qa03";
+         option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+         next-server 10.5.124.141;
+         filename "pxelinux.0";
     }
 
     host qa04 {
@@ -390,31 +398,39 @@ subnet 10.5.124.128 netmask 255.255.255.128 {
     }
 
     host virt01 {
-	hardware ethernet 52:54:00:a2:de:30;
-	fixed-address 10.5.124.159;
+     hardware ethernet 52:54:00:a2:de:30;
+     fixed-address 10.5.124.159;
         option host-name "virt01";
         option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
     }
 
     host virt02 {
-	hardware ethernet 52:54:00:fe:22:ff;
-	fixed-address 10.5.124.160;
+     hardware ethernet 52:54:00:fe:22:ff;
+     fixed-address 10.5.124.160;
         option host-name "virt02";
         option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
     }
 
     host virt03 {
-	hardware ethernet 52:54:00:c5:04:14;
-	fixed-address 10.5.124.161;
+     hardware ethernet 52:54:00:c5:04:14;
+     fixed-address 10.5.124.161;
         option host-name "virt03";
         option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
     }
 
     host virt04 {
-	hardware ethernet 52:54:00:b5:97:30;
-	fixed-address 10.5.124.162;
+     hardware ethernet 52:54:00:b5:97:30;
+     fixed-address 10.5.124.162;
         option host-name "virt04";
         option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+        next-server 10.5.124.141;
+        filename "pxelinux.0";
     }
 
     host virt05 {