modified as per marks comments.

Change-Id: Ica97dbdf0cfc9994da03a36b990133c32c9de183
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

3 files changed, 257 insertions, 254 deletions

diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index 53399495..f671a24b 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -1,83 +1,86 @@
-labconfig:
-    lab_location: intelpod5
-    labsettings:
-        upstream_dns: 8.8.8.8
+lab:
+  location: intel
+  racks:
+  - rack: pod5
     nodes:
-        - name: rack-5-m1
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1E:67:CF:BB:54"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:85:4E:2C"]
-          power:
-              type: ipmi
-              address: 10.2.117.81
-              user: root
-              pass: root
-        - name: rack-5-m2
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1E:67:CF:B8:93"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:84:08:B8"]
-          power:
-              type: ipmi
-              address: 10.2.117.82
-              user: root
-              pass: root
-        - name: rack-5-m3
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1E:67:E0:08:7F"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:84:07:0D"]
-          power:
-              type: ipmi
-              address: 10.2.117.83
-              user: root
-              pass: root
-        - name: rack-5-m4
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1E:67:E0:08:B1"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:83:FD:80"]
-          power:
-              type: ipmi
-              address: 10.2.117.84
-              user: root
-              pass: root
-        - name: rack-5-m5
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1E:67:E0:0A:4B"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:75:22:74"]
-          power:
-              type: ipmi
-              address: 10.2.117.85
-              user: root
-              pass: root
+    - name: rack-5-m1
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1E:67:CF:BB:54"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:85:4E:2C"]
+      power:
+        type: ipmi
+        address: 10.2.117.81
+        user: root
+        pass: root
+    - name: rack-5-m2
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1E:67:CF:B8:93"]
+      - ifname: eth4
+         spaces: [data]
+         mac: ["90:E2:BA:84:08:B8"]
+      power:
+        type: ipmi
+        address: 10.2.117.82
+        user: root
+        pass: root
+    - name: rack-5-m3
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1E:67:E0:08:7F"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:84:07:0D"]
+      power:
+        type: ipmi
+        address: 10.2.117.83
+        user: root
+        pass: root
+    - name: rack-5-m4
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1E:67:E0:08:B1"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:83:FD:80"]
+      power:
+        type: ipmi
+        address: 10.2.117.84
+        user: root
+        pass: root
+    - name: rack-5-m5
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1E:67:E0:0A:4B"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:75:22:74"]
+      power:
+        type: ipmi
+        address: 10.2.117.85
+        user: root
+        pass: root
+    floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.254,10.5.15.0/24
+    ext-port: "90:E2:BA:85:4E:2D"
+    dns: 8.8.8.8
 opnfv:
     release: c
     distro: trusty
@@ -88,9 +91,7 @@ opnfv:
     storage:
     - type: ceph
       disk: /srv
-    floating-ip-range:
     feature: odl_l2
-    ext-port: eth5
     spaces:
     - type: admin
       bridge: brAdm
diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml
index 6a9f8c55..a105133b 100644
--- a/labconfig/intel/pod6/labconfig.yaml
+++ b/labconfig/intel/pod6/labconfig.yaml
@@ -1,115 +1,116 @@
-labconfig:
-    lab_location: intelpod6
-    labsettings:
-        upstream_dns: 8.8.8.8
+lab:
+  location: intel
+  racks:
+  - rack: pod6
     nodes:
-        - name: rack-6-m1
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1e:67:d8:ba:46"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:83:FD:20"]
-          power:
-              type: ipmi
-              address: 10.2.117.96
-              user: root
-              pass: root
-        - name: rack-6-m2
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1e:67:e0:0b:72"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:75:30:F4"]
-          power:
-              type: ipmi
-              address: 10.2.117.97
-              user: root
-              pass: root
-        - name: rack-6-m3
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1e:67:e0:09:33"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:83:FE:74"]
-          power:
-              type: ipmi
-              address: 10.2.117.98
-              user: root
-              pass: root
-        - name: rack-6-m4
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1e:67:e0:09:fb"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:84:15:7C"]
-          power:
-              type: ipmi
-              address: 10.2.117.99
-              user: root
-              pass: root
-        - name: rack-6-m5
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth1
-                spaces: [admin]
-                mac: ["00:1e:67:cf:bc:f8"]
-              - ifname: eth4
-                spaces: [data]
-                mac: ["90:E2:BA:84:08:F4"]
-          power:
-              type: ipmi
-              address: 10.2.117.100
-              user: root
-              pass: root
+    - name: rack-6-m1
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1e:67:d8:ba:46"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:83:FD:20"]
+      power:
+        type: ipmi
+        address: 10.2.117.96
+        user: root
+        pass: root
+    - name: rack-6-m2
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1e:67:e0:0b:72"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:75:30:F4"]
+      power:
+        type: ipmi
+        address: 10.2.117.97
+        user: root
+        pass: root
+    - name: rack-6-m3
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1e:67:e0:09:33"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:83:FE:74"]
+      power:
+        type: ipmi
+        address: 10.2.117.98
+        user: root
+        pass: root
+    - name: rack-6-m4
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1e:67:e0:09:fb"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:84:15:7C"]
+      power:
+        type: ipmi
+        address: 10.2.117.99
+        user: root
+        pass: root
+    - name: rack-6-m5
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: eth1
+        spaces: [admin]
+        mac: ["00:1e:67:cf:bc:f8"]
+      - ifname: eth4
+        spaces: [data]
+        mac: ["90:E2:BA:84:08:F4"]
+      power:
+        type: ipmi
+        address: 10.2.117.100
+        user: root
+        pass: root
+    floating-ip-range: 10.6.15.6,10.6.15.250,10.6.15.254,10.6.15.0/24
+    ext-port: "90:E2:BA:83:FD:20"
+    dns: 8.8.8.8
 opnfv:
-    release: c
-    distro: trusty
-    type: nonha
-    openstack: liberty
-    sdncontroller:
-    - type: nosdn
-    storage:
-    - type: ceph
-      disk: /srv
-    floating-ip-range:
-    feature: odl_l2
-    ext-port: eth5
-    spaces:
-    - type: admin
-      bridge: brAdm
-      cidr: 10.6.1.0/24
-      gateway: 10.6.1.1
-      vlan:
-    - type: data
-      bridge: brData
-      cidr: 10.6.12.0/24
-      gateway:
-      vlan:
-    - type: public
-      bridge: brPublic
-      cidr: 10.6.15.0/24
-      gateway: 10.6.15.254
-      vlan:
-    - type: external
-      bridge: brExt
-      cidr:
-      gateway:
-      ipaddress: 10.2.117.107
-      vlan:
+  release: c
+  distro: trusty
+  type: nonha
+  openstack: liberty
+  sdncontroller:
+  - type: nosdn
+  storage:
+  - type: ceph
+  disk: /srv
+  feature: odl_l2
+  spaces:
+  - type: admin
+    bridge: brAdm
+    cidr: 10.6.1.0/24
+    gateway: 10.6.1.1
+    vlan:
+  - type: data
+    bridge: brData
+    cidr: 10.6.12.0/24
+    gateway:
+    vlan:
+  - type: public
+    bridge: brPublic
+    cidr: 10.6.15.0/24
+    gateway: 10.6.15.254
+    vlan:
+  - type: external
+    bridge: brExt
+    cidr:
+    gateway:
+    ipaddress: 10.2.117.107
+    vlan:
diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml
index 91a5dec4..2defa039 100644
--- a/labconfig/intel/pod9/labconfig.yaml
+++ b/labconfig/intel/pod9/labconfig.yaml
@@ -1,62 +1,65 @@
-labconfig:
-    lab_location: intelpod9
-    labsettings:
-        upstream_dns: 8.8.8.8
+lab:
+  location: intel
+  racks:
+  - rack: pod9
     nodes:
-        - name: rack-9-m1
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth3
-                spaces: [admin]
-                mac: ["00:1E:67:D4:30:38"]
-              - ifname: eth0
-                spaces: [data]
-                mac: ["00:1E:67:C5:5B:08"]
-              - ifname: eth1
-                spaces: [public]
-                mac: ["00:1E:67:C5:5B:09"]
-          power:
-              type: ipmi
-              address: 10.2.117.142
-              user: root
-              pass: root
-        - name: rack-9-m2
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth3
-                spaces: [admin]
-                mac: ["00:1E:67:D4:33:A2"]
-              - ifname: eth0
-                spaces: [data]
-                mac: ["00:1E:67:E2:6C:74"]
-              - ifname: eth1
-                spaces: [public]
-                mac: ["00:1E:67:E2:6C:75"]
-          power:
-              type: ipmi
-              address: 10.2.117.144
-              user: root
-              pass: root
-        - name: rack-9-m3
-          architecture: x86_64
-          roles: [compute,network,storage]
-          nics:
-              - ifname: eth3
-                spaces: [admin]
-                mac: ["00:1E:67:D4:2F:BA"]
-              - ifname: eth0
-                spaces: [data]
-                mac: ["00:1E:67:C5:5B:00"]
-              - ifname: eth1
-                spaces: [public]
-                mac: ["00:1E:67:C5:5B:01"]
-          power:
-              type: ipmi
-              address: 10.2.117.146
-              user: root
-              pass: root
+    - name: rack-9-m1
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: eth3
+        spaces: [admin]
+        mac: ["00:1E:67:D4:30:38"]
+      - ifname: eth0
+        spaces: [data]
+        mac: ["00:1E:67:C5:5B:08"]
+      - ifname: eth1
+        spaces: [public]
+        mac: ["00:1E:67:C5:5B:09"]
+      power:
+        type: ipmi
+        address: 10.2.117.142
+        user: root
+        pass: root
+    - name: rack-9-m2
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: eth3
+        spaces: [admin]
+        mac: ["00:1E:67:D4:33:A2"]
+      - ifname: eth0
+        spaces: [data]
+        mac: ["00:1E:67:E2:6C:74"]
+      - ifname: eth1
+        spaces: [public]
+        mac: ["00:1E:67:E2:6C:75"]
+      power:
+        type: ipmi
+        address: 10.2.117.144
+        user: root
+        pass: root
+    - name: rack-9-m3
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: eth3
+        spaces: [admin]
+        mac: ["00:1E:67:D4:2F:BA"]
+      - ifname: eth0
+        spaces: [data]
+        mac: ["00:1E:67:C5:5B:00"]
+      - ifname: eth1
+        spaces: [public]
+        mac: ["00:1E:67:C5:5B:01"]
+      power:
+        type: ipmi
+        address: 10.2.117.146
+        user: root
+        pass: root
+    floating-ip-range: 10.9.15.6,10.9.15.250,10.9.15.254,10.9.15.0/24
+    ext-port: "00:1E:67:C5:5B:09"
+    dns: 8.8.8.8
 opnfv:
     release: c
     distro: trusty
@@ -67,9 +70,7 @@ opnfv:
     storage:
     - type: ceph
       disk: /srv
-    floating-ip-range:
     feature: odl_l2
-    ext-port: eth5
     spaces:
     - type: admin
       bridge: brAdm