modified to accomodate latest intel pod changes from pod5 to pod21

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

2 files changed, 232 insertions, 54 deletions

diff --git a/labconfig/intel/pod21/labconfig.yaml b/labconfig/intel/pod21/labconfig.yaml
new file mode 100644
index 00000000..c0292d9a
--- /dev/null
+++ b/labconfig/intel/pod21/labconfig.yaml
@@ -0,0 +1,184 @@
+lab:
+  location: intel
+  racks:
+  - rack: pod5
+    nodes:
+    - name: rack-5-m1
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:CF:BB:54"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:CF:BB:53"]
+      - ifname: intf1.214
+        spaces: [storage]
+        mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: intf2
+        spaces: [public]
+        mac: ["90:E2:BA:85:4E:2D"]
+      power:
+        type: ipmi
+        address: 10.10.210.11
+        user: root
+        pass: root
+    - name: rack-5-m2
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:CF:B8:93"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["90:E2:BA:84:08:B8"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:CF:B8:92"]
+      - ifname: intf1.214
+        spaces: [storage]
+        mac: ["90:E2:BA:84:08:B8"]
+      - ifname: intf2
+        spaces: [public]
+        mac: ["90:E2:BA:84:08:B9"]
+      power:
+        type: ipmi
+        address: 10.10.210.12
+        user: root
+        pass: root
+    - name: rack-5-m3
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:E0:08:7F"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["90:E2:BA:84:07:0C"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:E0:08:7E"]
+      - ifname: intf1.214
+        spaces: [storage]
+        mac: ["90:E2:BA:84:07:0C"]
+      - ifname: intf2
+        spaces: [public]
+        mac: ["90:E2:BA:84:07:0D"]
+      power:
+        type: ipmi
+        address: 10.10.210.13
+        user: root
+        pass: root
+    - name: rack-5-m4
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:E0:08:B1"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["90:E2:BA:83:FD:80"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:E0:08:B0"]
+      - ifname: intf1.214
+        spaces: [storage]
+        mac: ["90:E2:BA:83:FD:80"]
+      - ifname: intf2
+        spaces: [public]
+        mac: ["90:E2:BA:83:FD:81"]
+      power:
+        type: ipmi
+        address: 10.10.210.14
+        user: root
+        pass: root
+    - name: rack-5-m5
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:E0:0A:4B"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["90:E2:BA:75:22:74"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:E0:0A:4A"]
+      - ifname: intf1.214
+        spaces: [storage]
+        mac: ["90:E2:BA:75:22:74"]
+      - ifname: intf2
+        spaces: [public]
+        mac: ["90:E2:BA:75:22:75"]
+      power:
+        type: ipmi
+        address: 10.10.210.15
+        user: root
+        pass: root
+#    - name: rack-5-m6
+#      architecture: x86_64
+#      roles: [compute,storage]
+#      nics:
+#      - ifname: intf0
+#        spaces: [admin]
+#        mac: ["98:4F:EE:10:03:43"]
+#      - ifname: intf1
+#        spaces: [data]
+#        mac: ["00:1E:67:9C:3E:54"]
+#      - ifname: intf2.4000
+#        spaces: [public]
+#        mac: ["00:1E:67:9C:3E:55"]
+#      power:
+#        type: ipmi
+#        address: 10.10.210.90
+#        user: root
+#        pass: root
+    floating-ip-range: 10.10.210.40,10.10.210.250,10.10.210.1,10.10.210.0/24
+    ext-port: "intf3"
+    dns: 8.8.8.8
+    osdomainname:
+opnfv:
+    release: d
+    distro: xenial
+    type: nonha
+    openstack: ocata
+    sdncontroller:
+    - type: nosdn
+    storage:
+    - type: ceph
+      disk: /dev/sdb
+    feature: odl_l2
+    spaces:
+    - type: admin
+      bridge: brAdm
+      cidr: 10.10.211.0/24
+      gateway: 10.10.211.1
+      vlan:
+    - type: data
+      bridge: brData
+      cidr: 10.10.212.0/24
+      gateway:
+      vlan:
+    - type: public
+      bridge: brStor
+      cidr: 10.10.213.0/24
+      gateway:
+      vlan:
+    - type: floating
+      bridge: brExt
+      cidr: 10.10.210.0/24
+      gateway:
+      vlan:
+    - type: storage
+      bridge: brMgmt
+      cidr: 10.10.214.0/24
+      gateway:
+      vlan: 214
diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index 4264d4d8..c0292d9a 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -13,18 +13,18 @@ lab:
       - ifname: intf1
         spaces: [data]
         mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: intf2.504
-        spaces: [public]
-        mac: ["90:E2:BA:85:4E:2D"]
-      - ifname: intf1.505
+      - ifname: intf3
         spaces: [floating]
+        mac: ["00:1E:67:CF:BB:53"]
+      - ifname: intf1.214
+        spaces: [storage]
         mac: ["90:E2:BA:85:4E:2C"]
       - ifname: intf2
-        spaces: [storage]
+        spaces: [public]
         mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
-        address: 10.2.117.85
+        address: 10.10.210.11
         user: root
         pass: root
     - name: rack-5-m2
@@ -37,18 +37,18 @@ lab:
       - ifname: intf1
         spaces: [data]
         mac: ["90:E2:BA:84:08:B8"]
-      - ifname: intf2.504
-        spaces: [public]
-        mac: ["90:E2:BA:84:08:B9"]
-      - ifname: intf1.505
+      - ifname: intf3
         spaces: [floating]
+        mac: ["00:1E:67:CF:B8:92"]
+      - ifname: intf1.214
+        spaces: [storage]
         mac: ["90:E2:BA:84:08:B8"]
       - ifname: intf2
-        spaces: [storage]
+        spaces: [public]
         mac: ["90:E2:BA:84:08:B9"]
       power:
         type: ipmi
-        address: 10.2.117.86
+        address: 10.10.210.12
         user: root
         pass: root
     - name: rack-5-m3
@@ -61,18 +61,18 @@ lab:
       - ifname: intf1
         spaces: [data]
         mac: ["90:E2:BA:84:07:0C"]
-      - ifname: intf2.504
-        spaces: [public]
-        mac: ["90:E2:BA:84:07:0D"]
-      - ifname: intf1.505
+      - ifname: intf3
         spaces: [floating]
+        mac: ["00:1E:67:E0:08:7E"]
+      - ifname: intf1.214
+        spaces: [storage]
         mac: ["90:E2:BA:84:07:0C"]
       - ifname: intf2
-        spaces: [storage]
+        spaces: [public]
         mac: ["90:E2:BA:84:07:0D"]
       power:
         type: ipmi
-        address: 10.2.117.87
+        address: 10.10.210.13
         user: root
         pass: root
     - name: rack-5-m4
@@ -85,18 +85,18 @@ lab:
       - ifname: intf1
         spaces: [data]
         mac: ["90:E2:BA:83:FD:80"]
-      - ifname: intf2.504
-        spaces: [public]
-        mac: ["90:E2:BA:83:FD:81"]
-      - ifname: intf1.505
+      - ifname: intf3
         spaces: [floating]
+        mac: ["00:1E:67:E0:08:B0"]
+      - ifname: intf1.214
+        spaces: [storage]
         mac: ["90:E2:BA:83:FD:80"]
       - ifname: intf2
-        spaces: [storage]
+        spaces: [public]
         mac: ["90:E2:BA:83:FD:81"]
       power:
         type: ipmi
-        address: 10.2.117.88
+        address: 10.10.210.14
         user: root
         pass: root
     - name: rack-5-m5
@@ -109,18 +109,18 @@ lab:
       - ifname: intf1
         spaces: [data]
         mac: ["90:E2:BA:75:22:74"]
-      - ifname: intf2.504
-        spaces: [public]
-        mac: ["90:E2:BA:75:22:75"]
-      - ifname: intf1.505
+      - ifname: intf3
         spaces: [floating]
+        mac: ["00:1E:67:E0:0A:4A"]
+      - ifname: intf1.214
+        spaces: [storage]
         mac: ["90:E2:BA:75:22:74"]
       - ifname: intf2
-        spaces: [storage]
+        spaces: [public]
         mac: ["90:E2:BA:75:22:75"]
       power:
         type: ipmi
-        address: 10.2.117.89
+        address: 10.10.210.15
         user: root
         pass: root
 #    - name: rack-5-m6
@@ -133,23 +133,23 @@ lab:
 #      - ifname: intf1
 #        spaces: [data]
 #        mac: ["00:1E:67:9C:3E:54"]
-#      - ifname: intf2.504
+#      - ifname: intf2.4000
 #        spaces: [public]
 #        mac: ["00:1E:67:9C:3E:55"]
 #      power:
 #        type: ipmi
-#        address: 10.2.117.90
+#        address: 10.10.210.90
 #        user: root
 #        pass: root
-    floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
-    ext-port: "intf1.505"
+    floating-ip-range: 10.10.210.40,10.10.210.250,10.10.210.1,10.10.210.0/24
+    ext-port: "intf3"
     dns: 8.8.8.8
     osdomainname:
 opnfv:
-    release: c
-    distro: trusty
+    release: d
+    distro: xenial
     type: nonha
-    openstack: liberty
+    openstack: ocata
     sdncontroller:
     - type: nosdn
     storage:
@@ -159,32 +159,26 @@ opnfv:
     spaces:
     - type: admin
       bridge: brAdm
-      cidr: 10.5.1.0/24
-      gateway: 10.5.1.1
+      cidr: 10.10.211.0/24
+      gateway: 10.10.211.1
       vlan:
     - type: data
       bridge: brData
-      cidr: 10.5.12.0/24
+      cidr: 10.10.212.0/24
       gateway:
       vlan:
-    - type: storage
+    - type: public
       bridge: brStor
-      cidr: 10.5.13.0/24
+      cidr: 10.10.213.0/24
       gateway:
       vlan:
-    - type: public
-      bridge: brMgmt
-      cidr: 10.5.14.0/24
-      gateway:
-      vlan: 504
     - type: floating
-      bridge: brPublic
-      cidr: 10.5.15.0/24
-      gateway:
-      vlan: 505
-    - type: external
       bridge: brExt
-      cidr:
+      cidr: 10.10.210.0/24
       gateway:
-      ipaddress: 10.2.117.92
       vlan:
+    - type: storage
+      bridge: brMgmt
+      cidr: 10.10.214.0/24
+      gateway:
+      vlan: 214