colo: adjust r3 servers for new configuration

Change-Id: I6bb6837fcb335db602049a0a076e9f2441ce5caa

1 files changed, 58 insertions, 38 deletions

diff --git a/host_vars/aus-colo.linaro.org b/host_vars/aus-colo.linaro.org
index f507bf63..0cca0864 100644
--- a/host_vars/aus-colo.linaro.org
+++ b/host_vars/aus-colo.linaro.org
@@ -347,79 +347,99 @@ racks:
       ip: 10.30.101.3
       pxe: false
 
-    - mac: "8c:fd:f0:01:f5:8e"
-      name: r3-a4
+    - name: r3-a4
+      mac: "8c:fd:f0:01:f5:8e"
       ip: 10.30.100.4
       tag: qa-net
-    - mac: "8c:fd:f0:01:74:df"
-      name: r3-a4-bmc
+    - name: r3-a4-bmc
+      mac: "8c:fd:f0:01:74:df"
       ip: 10.30.101.4
       pxe: false
-    - mac: "8c:fd:f0:01:f6:0a"
-      name: r3-a5
+    - name: r3-a5
+      mac: "e4:1d:2d:b0:03:40"
       ip: 10.30.100.5
+      pxe: false
+    - name: r3-a5-pxe
+      mac: "8c:fd:f0:01:f6:0a"
+      ip: 10.30.102.5
       tag: qa-net
-    - mac: "8c:fd:f0:01:bf:ed"
-      name: r3-a5-bmc
+    - name: r3-a5-bmc
+      mac: "8c:fd:f0:01:bf:ed"
       ip: 10.30.101.5
       pxe: false
-    - mac: "8c:fd:f0:01:fa:c8"
-      name: r3-a6
+    - name: r3-a6
+      mac: "e4:1d:2d:e4:4d:10"
       ip: 10.30.100.6
+      pxe: false
+    - name: r3-a6-pxe
+      mac: "8c:fd:f0:01:fa:c8"
+      ip: 10.30.102.6
       tag: qa-net
-    - mac: "8c:fd:f0:01:75:05"
-      name: r3-a6-bmc
+    - name: r3-a6-bmc
+      mac: "8c:fd:f0:01:75:05"
       ip: 10.30.101.6
       pxe: false
-    - mac: "e4:1d:2d:e4:4d:00"
-      name: r3-a7
+    - name: r3-a7
+      mac: "e4:1d:2d:e4:4d:00"
       ip: 10.30.100.7
-    - mac: "8c:fd:f0:01:f9:f8"
-      name: r3-a7-pxe
+    - name: r3-a7-pxe
+      mac: "8c:fd:f0:01:f9:f8"
       ip: 10.30.102.7
       tag: qa-net
-    - mac: "8c:fd:f0:01:75:09"
-      name: r3-a7-bmc
+    - name: r3-a7-bmc
+      mac: "8c:fd:f0:01:75:09"
       ip: 10.30.101.7
       pxe: false
-    - mac: "8c:fd:f0:01:f9:f6"
-      name: r3-a8
+    - name: r3-a8
+      mac: "e4:1d:2d:e4:53:f0"
       ip: 10.30.100.8
+      pxe: false
+    - name: r3-a8-pxe
+      mac: "8c:fd:f0:01:f9:f6"
+      ip: 10.30.102.8
       tag: qa-net
-    - mac: "8c:fd:f0:01:74:ea"
-      name: r3-a8-bmc
+    - name: r3-a8-bmc
+      mac: "8c:fd:f0:01:74:ea"
       ip: 10.30.101.8
       pxe: false
-    - mac: "8c:fd:f0:01:f6:b6"
-      name: r3-a9
+    - name: r3-a9
+      mac: "e4:1d:2d:bb:66:e0"
       ip: 10.30.100.9
+      pxe: false
+    - name: r3-a9-pxe
+      mac: "8c:fd:f0:01:f6:b6"
+      ip: 10.30.102.9
       tag: qa-net
-    - mac: "8c:fd:f0:01:74:e1"
-      name: r3-a9-bmc
+    - name: r3-a9-bmc
+      mac: "8c:fd:f0:01:74:e1"
       ip: 10.30.101.9
       pxe: false
-    - mac: "8c:fd:f0:01:f5:9a"
-      name: r3-a10
+    - name: r3-a10
+      mac: "e4:1d:2d:e4:53:d0"
       ip: 10.30.100.10
+      pxe: false
+    - name: r3-a10-pxe
+      mac: "8c:fd:f0:01:f5:9a"
+      ip: 10.30.102.10
       tag: qa-net
-    - mac: "8c:fd:f0:01:1e:30"
-      name: r3-a10-bmc
+    - name: r3-a10-bmc
+      mac: "8c:fd:f0:01:1e:30"
       ip: 10.30.101.10
       pxe: false
-    - mac: "8c:fd:f0:01:f7:82"
-      name: r3-a11
+    - name: r3-a11
+      mac: "8c:fd:f0:01:f7:82"
       ip: 10.30.100.11
       tag: qa-net
-    - mac: "8c:fd:f0:01:74:e3"
-      name: r3-a11-bmc
+    - name: r3-a11-bmc
+      mac: "8c:fd:f0:01:74:e3"
       ip: 10.30.101.11
       pxe: false
-    - mac: "8c:fd:f0:01:f7:96"
-      name: r3-a12
+    - name: r3-a12
+      mac: "8c:fd:f0:01:f7:96"
       ip: 10.30.100.12
       tag: qa-net
-    - mac: "8c:fd:f0:01:1e:32"
-      name: r3-a12-bmc
+    - name: r3-a12-bmc
+      mac: "8c:fd:f0:01:1e:32"
       ip: 10.30.101.12
       pxe: false