diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
index 770b024be9..27ad413634 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -891,7 +891,6 @@ host dell-fx02-fc08-mgmt {
      fixed-address 10.3.160.28;
      option host-name "dell-fx02-08";
 }
-
 host cavium01-mgmt {
      hardware ethernet e0:d5:5e:ae:59:8d;
      fixed-address 10.3.160.29;
@@ -902,42 +901,160 @@ host cavium02-mgmt {
      fixed-address 10.3.160.30;
      option host-name "cavium02";
 }
-
-host bvmhost-p08-01-mgmt {
-     hardware ethernet a0:42:3f:32:b2:fb;
-     fixed-address 10.3.160.121;
-     option host-name "bvmhost-p08-01";
+host opengear01 {
+     hardware ethernet 00:13:C6:01:00:85;
+     fixed-address 10.3.160.31;
+     option host-name "opengear01-mgmt";
 }
-host bvmhost-p08-02-mgmt {
-     hardware ethernet 98:BE:94:4B:9C:D2;
-     fixed-address 10.3.160.122;
-     option host-name "bvmhost-p08-02";
+host dell-r6x0-01-mgmt {
+     hardware ethernet 64:00:6A:C4:8A:BE;
+     fixed-address 10.3.160.33;
+     option host-name "vmhost02-stg-mgmt";
 }
-
-host bvmhost-p08-03-mgmt {
-     hardware ethernet 40:F2:E9:A5:47:60;
-     fixed-address 10.3.160.123;
-     option host-name "bvmhost-p08-03";
+host dell-r6x0-02-mgmt {
+     hardware ethernet 64:00:6A:C1:DC:82;
+     fixed-address 10.3.160.34;
+     option host-name "bvmhost01-stg-mgmt";
 }
-host bvmhost-p08-04-mgmt {
-     hardware ethernet 98:BE:94:4B:96:10;
-     fixed-address 10.3.160.124;
-     option host-name "bvmhost-p08-04";
+host dell-r6x0-03-mgmt {
+     hardware ethernet 64:00:6A:C1:EF:F0;
+     fixed-address 10.3.160.35;
+     option host-name "bvmhost01-mgmt";
 }
-host bvmhost-p08-05-mgmt {
-     hardware ethernet 98:BE:94:4B:94:C4;
-     fixed-address 10.3.160.125;
-     option host-name "bvmhost-p08-05";
+host dell-r6x0-04-mgmt {
+     hardware ethernet 84:7b:eb:f3:62:32;
+     fixed-address 10.3.160.36;
+     option host-name "virthost06";
 }
-host bvmhost-p09-03-mgmt {
-     hardware ethernet ac:1f:6b:5c:03:9d;
-     fixed-address 10.3.160.128;
-     option host-name "bvmhost-p09-03";
+host dell-r6x0-05-mgmt {
+     hardware ethernet 84:7B:EB:F3:BC:7A;
+     fixed-address 10.3.160.37;
+     option host-name "bvirthost04";
 }
-host bvmhost-p09-04-mgmt {
-     hardware ethernet ac:1f:6b:5c:03:94;
-     fixed-address 10.3.160.129;
-     option host-name "bvmhost-p09-04";
+host dell-r6x0-06-mgmt {
+     hardware ethernet 10:7D:1A:FF:5A:B6;
+     fixed-address 10.3.160.38;
+     option host-name "bvirthost05";
+}
+host dell-r6x0-07-mgmt {
+     hardware ethernet D0:94:66:44:CE:44;
+     fixed-address 10.3.160.39;
+     option host-name "vmhost01";
+} 
+host dell-r6x0-08-mgmt {
+     hardware ethernet 58:8A:5A:F3:9E:BC ;
+     fixed-address 10.3.160.40;
+     option host-name "virthost14";
+} 
+host dell-r6x0-09-mgmt {
+     hardware ethernet 58:8A:5A:EE:EF:F0;
+     fixed-address 10.3.160.41;
+     option host-name "virthost12";
+} 
+host dell-r6x0-10-mgmt {
+     hardware ethernet 74:E6:E2:FD:78:54 ;
+     fixed-address 10.3.160.42;
+     option host-name "virthost19";
+} 
+host dell-r6x0-11-mgmt {
+     hardware ethernet 74:E6:E2:FD:6A:5A;
+     fixed-address 10.3.160.43;
+     option host-name "virthost20";
+} 
+host dell-r6x0-12-mgmt {
+     hardware ethernet 74:E6:E2:FD:76:DE;
+     fixed-address 10.3.160.44;
+     option host-name "virthost21";
+}
+host dell-r6x0-13-mgmt {
+     hardware ethernet 74:e6:e2:fd:76:ba;
+     fixed-address 10.3.160.45;
+     option host-name "virthost22";
+}
+host dell-r6x0-15-mgmt {
+     hardware ethernet 4c:d9:8f:04:64:5e;
+     fixed-address 10.3.160.47;
+     option host-name "vmhost01-mgmt";
+}
+host dell-r6x0-17-mgmt {
+     hardware ethernet 58:8A:5A:EE:F0:02;
+     fixed-address 10.3.160.49;
+     option host-name "bvirthost12";
+}
+host dell-r6x0-18-mgmt {
+     hardware ethernet 58:8A:5A:EE:F0:72;
+     fixed-address 10.3.160.50;
+     option host-name "bvirthost13";
+}
+host dell-r6x0-19-mgmt {
+     hardware ethernet 58:8A:5A:F3:A1:CE;
+     fixed-address 10.3.160.51;
+     option host-name "bvirthost15";
+}
+host dell-r6x0-20-mgmt {
+     hardware ethernet 4c:d9:8f:03:95:28;
+     fixed-address 10.3.160.52;
+     option host-name "qa01-mgmt";
+}
+host dell-r6x0-21 {
+     hardware ethernet 4c:d9:8f:04:3d:1c;
+     fixed-address 10.3.160.53;
+     option host-name "qa02-mgmt";
+}
+host system-22 {
+     hardware ethernet B8:2A:72:FC:ED:22;
+     fixed-address 10.3.160.54;
+     option host-name "vmhost-iad-09-mgmt";
+}
+host vmhost-qa-04-mgmt {
+     hardware ethernet 74:E6:E2:F9:FF:7E;
+     fixed-address 10.3.160.57;
+     option host-name "vmhost-qa-04-mgmt";
+}
+host vmhost-02-mgmt {
+     hardware ethernet B8:2A:72:FC:ED:64;
+     fixed-address 10.3.160.58;
+     option host-name "vmhost-02-mgmt";
+}
+host backup-mgmt {
+     hardware ethernet 74:E6:E2:FB:4D:FC;
+     fixed-address 10.3.160.59;
+     option host-name "backup01";
+}
+host openqa-p09-02-mgmt {
+     hardware ethernet ac:1f:6b:5c:03:f9;
+     fixed-address 10.3.160.60;
+     option host-name "ppc9-03";
+}
+host openqa-p09-01-mgmt {
+     hardware ethernet ac:1f:6b:5c:03:69;
+     fixed-address 10.3.160.61;
+     option host-name "openqa-p09-01";
+}
+host svault06-mgmt {
+     hardware ethernet D0:94:66:45:A1:66;
+     fixed-address 10.3.160.63;
+     option host-name "sign-vault06";
+}
+host qa-vmhost01-mgmt {
+     hardware ethernet f4:02:70:cf:c2:ca;
+     fixed-address 10.3.160.64;
+     option host-name "qa-vmhost01-mgmt";
+}
+host kernel03-mgmt {
+     hardware ethernet d0:94:66:7c:b2:dd;
+     fixed-address 10.3.160.65;
+     option host-name "kernel-03";
+}
+host openqa-p08-01-mgmt {
+     hardware ethernet A0:42:3F:31:C2:7E;
+     fixed-address 10.3.160.66;
+     option host-name "openqa-ppc-01-mgmt";
+}
+host vmhost-qa-01-mgmt {
+     hardware ethernet 58:8A:5A:F3:9C:02;
+     fixed-address 10.3.160.68;
+     option host-name "vmhost-qa-01-mgmt";
 }
 
 host bvmhost-a64-01-mgmt {
@@ -1015,7 +1132,41 @@ host bvmhost-a64-osbs01-mgmt {
      fixed-address 10.3.160.120;
      option host-name "bvmhost-a64-osbs01-01";
 }
-
+host bvmhost-p08-01-mgmt {
+     hardware ethernet a0:42:3f:32:b2:fb;
+     fixed-address 10.3.160.121;
+     option host-name "bvmhost-p08-01";
+}
+host bvmhost-p08-02-mgmt {
+     hardware ethernet 98:BE:94:4B:9C:D2;
+     fixed-address 10.3.160.122;
+     option host-name "bvmhost-p08-02";
+}
+host bvmhost-p08-03-mgmt {
+     hardware ethernet 40:F2:E9:A5:47:60;
+     fixed-address 10.3.160.123;
+     option host-name "bvmhost-p08-03";
+}
+host bvmhost-p08-04-mgmt {
+     hardware ethernet 98:BE:94:4B:96:10;
+     fixed-address 10.3.160.124;
+     option host-name "bvmhost-p08-04";
+}
+host bvmhost-p08-05-mgmt {
+     hardware ethernet 98:BE:94:4B:94:C4;
+     fixed-address 10.3.160.125;
+     option host-name "bvmhost-p08-05";
+}
+host bvmhost-p09-03-mgmt {
+     hardware ethernet ac:1f:6b:5c:03:9d;
+     fixed-address 10.3.160.128;
+     option host-name "bvmhost-p09-03";
+}
+host bvmhost-p09-04-mgmt {
+     hardware ethernet ac:1f:6b:5c:03:94;
+     fixed-address 10.3.160.129;
+     option host-name "bvmhost-p09-04";
+}
 host openqa-a64-01-mgmt {
      hardware ethernet E8:6A:64:97:6B:49;
      fixed-address 10.3.160.141;
@@ -1031,13 +1182,25 @@ host openqa-a64-03-mgmt {
      fixed-address 10.3.160.143;
      option host-name "openqa-a64-03";
 }
+host bkernel01-mgmt {
+     hardware ethernet D0:94:66:45:8C:13;
+     fixed-address 10.3.160.156;
+     option host-name "bkernel01";
+}
+host bkernel02-mgmt {
+     hardware ethernet D0:94:66:45:8C:0F;
+     fixed-address 10.3.160.157;
+     option host-name "bkernel02";
+}
+
+
+
 host bhwhost-a64-02-mgmt {
      hardware ethernet AA:31:8D:3E:31:6F ;
      fixed-address 10.3.160.244;
      option routers 10.3.160.254;
      option subnet-mask 255.255.255.0;
 }
-
 host svault02-mgmt {
      hardware ethernet D0:94:66:45:87:C5;
      fixed-address 10.3.160.133;
@@ -1049,136 +1212,22 @@ host dell-630-01-mgmt {
      fixed-address 10.3.160.191;
      option host-name "bvirthost14";
 }
-host bkernel01-mgmt {
-     hardware ethernet D0:94:66:45:8C:13;
-     fixed-address 10.3.160.156;
-     option host-name "bkernel01";
-}
-host bkernel02-mgmt {
-     hardware ethernet D0:94:66:45:8C:0F;
-     fixed-address 10.3.160.157;
-     option host-name "bkernel02";
-}
-host opengear01 {
-     hardware ethernet 00:13:C6:01:00:85;
-     fixed-address 10.3.160.31;
-     option host-name "opengear01-mgmt";
-}
-host opengear02 {
-     hardware ethernet 00:13:C6:01:5C:FF;
-     fixed-address 10.3.160.32;
-     option host-name "opengear02-mgmt";
-}
-host dell-r6x0-01-mgmt {
-     hardware ethernet 64:00:6A:C4:8A:BE;
-     fixed-address 10.3.160.33;
-     option host-name "vmhost02-stg-mgmt";
-}
-host dell-r6x0-02-mgmt {
-     hardware ethernet 64:00:6A:C1:DC:82;
-     fixed-address 10.3.160.34;
-     option host-name "bvmhost01-stg-mgmt";
-}
-host dell-r6x0-03-mgmt {
-     hardware ethernet 64:00:6A:C1:EF:F0;
-     fixed-address 10.3.160.35;
-     option host-name "bvmhost01-mgmt";
-}
-host dell-r6x0-04-mgmt {
-     hardware ethernet 84:7b:eb:f3:62:32;
-     fixed-address 10.3.160.36;
-     option host-name "virthost06";
-}
-host dell-r6x0-05-mgmt {
-     hardware ethernet 84:7B:EB:F3:BC:7A;
-     fixed-address 10.3.160.37;
-     option host-name "bvirthost04";
-}
-host dell-r6x0-06-mgmt {
-     hardware ethernet 10:7D:1A:FF:5A:B6;
-     fixed-address 10.3.160.38;
-     option host-name "bvirthost05";
-}
-host dell-r6x0-07-mgmt {
-     hardware ethernet D0:94:66:44:CE:44;
-     fixed-address 10.3.160.39;
-     option host-name "vmhost01";
-} 
-host dell-r6x0-08-mgmt {
-     hardware ethernet 58:8A:5A:F3:9E:BC ;
-     fixed-address 10.3.160.40;
-     option host-name "virthost14";
-} 
-host dell-r6x0-09-mgmt {
-     hardware ethernet 58:8A:5A:EE:EF:F0;
-     fixed-address 10.3.160.41;
-     option host-name "virthost12";
-} 
-host dell-r6x0-10-mgmt {
-     hardware ethernet 74:E6:E2:FD:78:54 ;
-     fixed-address 10.3.160.42;
-     option host-name "virthost19";
-} 
-host dell-r6x0-11-mgmt {
-     hardware ethernet 74:E6:E2:FD:6A:5A;
-     fixed-address 10.3.160.43;
-     option host-name "virthost20";
-} 
-host dell-r6x0-12-mgmt {
-     hardware ethernet 74:E6:E2:FD:76:DE;
-     fixed-address 10.3.160.44;
-     option host-name "virthost21";
-}
-host dell-r6x0-13-mgmt {
-     hardware ethernet 74:e6:e2:fd:76:ba;
-     fixed-address 10.3.160.45;
-     option host-name "virthost22";
+host system-vmhost-mgmt {
+     hardware ethernet B8:2A:72:FC:EE:68;
+     fixed-address 10.3.160.199;
+     option host-name "vmhost-11-mgmt";
 }
+
 host dell-r6x0-14-mgmt {
      hardware ethernet 5c:f3:fc:53:db:fd;
      fixed-address 10.3.160.46;
      option host-name "virthost-comm01-mgmt";
 }
-host dell-r6x0-15-mgmt {
-     hardware ethernet 4c:d9:8f:04:64:5e;
-     fixed-address 10.3.160.47;
-     option host-name "vmhost01-mgmt";
-}
 host dell-r6x0-16-mgmt {
      hardware ethernet 58:8A:5A:EE:F2:0E;
      fixed-address 10.3.160.48;
      option host-name "vmhost01-stg-mgmt";
 }
-host dell-r6x0-17-mgmt {
-     hardware ethernet 58:8A:5A:EE:F0:02;
-     fixed-address 10.3.160.49;
-     option host-name "bvirthost12";
-}
-host dell-r6x0-18-mgmt {
-     hardware ethernet 58:8A:5A:EE:F0:72;
-     fixed-address 10.3.160.50;
-     option host-name "bvirthost13";
-}
-host dell-r6x0-19-mgmt {
-     hardware ethernet 58:8A:5A:F3:A1:CE;
-     fixed-address 10.3.160.51;
-     option host-name "bvirthost15";
-}
-host dell-r6x0-20-mgmt {
-     hardware ethernet 4c:d9:8f:03:95:28;
-     fixed-address 10.3.160.52;
-     option host-name "qa01-mgmt";
-}
-host dell-r6x0-21 {
-     hardware ethernet 4c:d9:8f:04:3d:1c;
-     fixed-address 10.3.160.53;
-     option host-name "qa02-mgmt";
-}
-host system-22 {
-     hardware ethernet B8:2A:72:FC:ED:22;
-     fixed-address 10.3.160.54;
-     option host-name "vmhost-iad-09-mgmt";
-}
 host system-23 {
      hardware ethernet B8:2A:72:FC:F2:2E;
      fixed-address 10.3.160.55;
@@ -1189,59 +1238,3 @@ host vmhost-iad-11-mgmt {
      fixed-address 10.3.160.56;
      option host-name "vmhost-iad-11-mgmt";
 }
-host vmhost-qa-04-mgmt {
-     hardware ethernet 74:E6:E2:F9:FF:7E;
-     fixed-address 10.3.160.57;
-     option host-name "vmhost-qa-04-mgmt";
-}
-host vmhost-02-mgmt {
-     hardware ethernet B8:2A:72:FC:ED:64;
-     fixed-address 10.3.160.58;
-     option host-name "vmhost-02-mgmt";
-}
-host backup-mgmt {
-     hardware ethernet 74:E6:E2:FB:4D:FC;
-     fixed-address 10.3.160.59;
-     option host-name "backup01";
-}
-host svault06-mgmt {
-     hardware ethernet D0:94:66:45:A1:66;
-     fixed-address 10.3.160.63;
-     option host-name "sign-vault06";
-}
-host qa-vmhost01-mgmt {
-     hardware ethernet f4:02:70:cf:c2:ca;
-     fixed-address 10.3.160.64;
-     option host-name "qa-vmhost01-mgmt";
-}
-host kernel03-mgmt {
-     hardware ethernet d0:94:66:7c:b2:dd;
-     fixed-address 10.3.160.65;
-     option host-name "kernel-03";
-}
-host openqa-p08-01-mgmt {
-     hardware ethernet A0:42:3F:31:C2:7E;
-     fixed-address 10.3.160.66;
-     option host-name "openqa-ppc-01-mgmt";
-}
-host openqa-p09-01-mgmt {
-     hardware ethernet ac:1f:6b:5c:03:69;
-     fixed-address 10.3.160.61;
-     option host-name "openqa-p09-01";
-}
-host openqa-p09-02-mgmt {
-     hardware ethernet ac:1f:6b:5c:03:f9;
-     fixed-address 10.3.160.60;
-     option host-name "ppc9-03";
-}
-host vmhost-qa-01-mgmt {
-     hardware ethernet 58:8A:5A:F3:9C:02;
-     fixed-address 10.3.160.68;
-     option host-name "vmhost-qa-01-mgmt";
-}
-host system-vmhost-mgmt {
-     hardware ethernet B8:2A:72:FC:EE:68;
-     fixed-address 10.3.160.199;
-     option host-name "vmhost-11-mgmt";
-}
-