modified to replace neutron with openstack commands.

Added intel pod19 labconfig as well. updated with comments.

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

4 files changed, 363 insertions, 4 deletions

diff --git a/labconfig/enea/pod5/labconfig.yaml b/labconfig/enea/pod5/labconfig.yaml
index 498b0a4f..a1c8a7ea 100644
--- a/labconfig/enea/pod5/labconfig.yaml
+++ b/labconfig/enea/pod5/labconfig.yaml
@@ -132,7 +132,7 @@ lab:
     osdomainname:
 #below section shoiuld define the jumphost.
 opnfv:
-    release: d
+    release: f
     distro: xenial
     type: noha
     openstack: pike
diff --git a/labconfig/enea/pod6/labconfig.yaml b/labconfig/enea/pod6/labconfig.yaml
new file mode 100644
index 00000000..193078bf
--- /dev/null
+++ b/labconfig/enea/pod6/labconfig.yaml
@@ -0,0 +1,170 @@
+lab:
+  location: enea
+  racks:
+  - rack: pod6
+    nodes:
+    - name: cn8890-24
+      architecture: aarch64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["68:05:ca:5a:c3:a7"]
+      - ifname: intf1.2323
+        spaces: [public]
+        mac: ["1c:1b:0d:e8:fa:83"]
+      - ifname: intf1.2324
+        spaces: [storage]
+        mac: ["1c:1b:0d:e8:fa:83"]
+      - ifname: intf1.2325
+        spaces: [data]
+        mac: ["1c:1b:0d:e8:fa:83"]
+      - ifname: intf1
+        spaces: [floating]
+        mac: ["1c:1b:0d:e8:fa:83"]
+      power:
+        type: ipmi
+        address: 10.0.1.54
+        user: ADMIN
+        pass: ADMIN
+    - name: cn8890-25
+      architecture: aarch64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["68:05:ca:5a:c3:bc"]
+      - ifname: intf1.2323
+        spaces: [public]
+        mac: ["1c:1b:0d:e8:fb:a5"]
+      - ifname: intf1.2324
+        spaces: [storage]
+        mac: ["1c:1b:0d:e8:fb:a5"]
+      - ifname: intf1.2325
+        spaces: [data]
+        mac: ["1c:1b:0d:e8:fb:a5"]
+      - ifname: intf1
+        spaces: [floating]
+        mac: ["1c:1b:0d:e8:fb:a5"]
+      power:
+        type: ipmi
+        address: 10.0.1.55
+        user: ADMIN
+        pass: ADMIN
+
+    - name: cn8890-26
+      architecture: aarch64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["68:05:ca:61:b9:00"]
+      - ifname: intf1.2323
+        spaces: [public]
+        mac: ["1c:1b:0d:e8:fa:65"]
+      - ifname: intf1.2324
+        spaces: [storage]
+        mac: ["1c:1b:0d:e8:fa:65"]
+      - ifname: intf1.2325
+        spaces: [data]
+        mac: ["1c:1b:0d:e8:fa:65"]
+      - ifname: intf1
+        spaces: [floating]
+        mac: ["1c:1b:0d:e8:fa:65"]
+      power:
+        type: ipmi
+        address: 10.0.1.56
+        user: ADMIN
+        pass: ADMIN
+
+    - name: cn8890-27
+      architecture: aarch64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["68:05:ca:57:f7:16"]
+      - ifname: intf1.2323
+        spaces: [public]
+        mac: ["1c:1b:0d:e8:fb:19"]
+      - ifname: intf1.2324
+        spaces: [storage]
+        mac: ["1c:1b:0d:e8:fb:19"]
+      - ifname: intf1.2325
+        spaces: [data]
+        mac: ["1c:1b:0d:e8:fb:19"]
+      - ifname: intf1
+        spaces: [floating]
+        mac: ["1c:1b:0d:e8:fb:19"]
+      power:
+        type: ipmi
+        address: 10.0.1.57
+        user: ADMIN
+        pass: ADMIN
+
+    - name: cn8890-28
+      architecture: aarch64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["68:05:ca:61:97:5a"]
+      - ifname: intf1.2323
+        spaces: [public]
+        mac: ["1c:1b:0d:e8:fb:7d"]
+      - ifname: intf1.2324
+        spaces: [storage]
+        mac: ["1c:1b:0d:e8:fb:7d"]
+      - ifname: intf1.2325
+        spaces: [data]
+        mac: ["1c:1b:0d:e8:fb:7d"]
+      - ifname: intf1
+        spaces: [floating]
+        mac: ["1c:1b:0d:e8:fb:7d"]
+      power:
+        type: ipmi
+        address: 10.0.1.58
+        user: ADMIN
+        pass: ADMIN
+    floating-ip-range: 10.0.15.40,10.0.15.250,10.0.15.254,10.0.15.0/24
+    ext-port: "intf1"
+    dns: 8.8.8.8
+    osdomainname:
+#below section shoiuld define the jumphost.
+opnfv:
+    release: f
+    distro: xenial
+    type: noha
+    openstack: pike
+    sdncontroller:
+    - type: nosdn
+    storage:
+    - type: ceph
+      disk: /dev/sdb
+    feature: odl_l2
+    spaces:
+    - type: admin
+      bridge: admin14_br0
+      cidr: 192.168.11.0/24
+      gateway: 192.168.11.1
+      vlan:
+    - type: floating
+      cidr: 10.0.15.0/24
+      gateway: 10.0.15.254
+      vlan:
+      mac: ["00:01:73:02:36:d5"]
+    - type: public
+      cidr: 172.16.10.0/24
+      gateway:
+      vlan: 2323
+      mac: ["00:01:73:02:36:d5"]
+    - type: storage
+      cidr: 10.2.0.0/24
+      gateway:
+      vlan: 2324
+      mac: ["00:01:73:02:36:d5"]
+    - type: data
+      cidr: 10.1.0.0/24
+      gateway:
+      vlan: 2325
+      mac: ["00:01:73:02:36:d5"]
diff --git a/labconfig/intel/pod19/labconfig.yaml b/labconfig/intel/pod19/labconfig.yaml
new file mode 100644
index 00000000..cc6ad70e
--- /dev/null
+++ b/labconfig/intel/pod19/labconfig.yaml
@@ -0,0 +1,171 @@
+lab:
+  location: intel
+  racks:
+  - rack: pod19
+    nodes:
+    - name: rack-19-m1
+      architecture: x86_64
+      roles: [network,control]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:FC:FC:B0"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["00:1E:67:F8:6A:78"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:FC:FC:AF"]
+      - ifname: intf2.4000
+        spaces: [public]
+        mac: ["00:1E:67:F8:6A:79"]
+      - ifname: intf2
+        spaces: [storage]
+        mac: ["00:1E:67:F8:6A:79"]
+      power:
+        type: ipmi
+        address: 10.10.190.11
+        user: root
+        pass: root
+    - name: rack-19-m2
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:FE:F4:1A"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["00:1E:67:F8:6A:40"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:FE:F4:19"]
+      - ifname: intf2.4000
+        spaces: [public]
+        mac: ["00:1E:67:F8:6A:41"]
+      - ifname: intf2
+        spaces: [storage]
+        mac: ["00:1E:67:F8:6A:41"]
+      power:
+        type: ipmi
+        address: 10.10.190.12
+        user: root
+        pass: root
+    - name: rack-19-m3
+      architecture: x86_64
+      roles: [compute,control,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:F1:5B:91"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["00:1E:67:F8:69:80"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:F1:5B:90"]
+      - ifname: intf2.4000
+        spaces: [public]
+        mac: ["00:1E:67:F8:69:81"]
+      - ifname: intf2
+        spaces: [storage]
+        mac: ["00:1E:67:F8:69:81"]
+      power:
+        type: ipmi
+        address: 10.10.190.13
+        user: root
+        pass: root
+    - name: rack-19-m4
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:FE:F0:78"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["00:1E:67:F8:6A:58"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:FE:F0:77"]
+      - ifname: intf2.4000
+        spaces: [public]
+        mac: ["00:1E:67:F8:6A:59"]
+      - ifname: intf2
+        spaces: [storage]
+        mac: ["00:1E:67:F8:6A:59"]
+      power:
+        type: ipmi
+        address: 10.10.190.14
+        user: root
+        pass: root
+    - name: rack-19-m5
+      architecture: x86_64
+      roles: [compute,storage]
+      nics:
+      - ifname: intf0
+        spaces: [admin]
+        mac: ["00:1E:67:FC:FF:17"]
+      - ifname: intf1
+        spaces: [data]
+        mac: ["00:1E:67:F8:6A:60"]
+      - ifname: intf3
+        spaces: [floating]
+        mac: ["00:1E:67:FC:FF:16"]
+      - ifname: intf2.4000
+        spaces: [public]
+        mac: ["00:1E:67:F8:6A:61"]
+      - ifname: intf2
+        spaces: [storage]
+        mac: ["00:1E:67:F8:6A:61"]
+      power:
+        type: ipmi
+        address: 10.10.190.15
+        user: root
+        pass: root
+    floating-ip-range: 10.10.190.40,10.10.190.250,10.10.190.1,10.10.190.0/24
+    ext-port: "intf3"
+    dns: 8.8.8.8
+    osdomainname:
+opnfv:
+    release: d
+    distro: xenial
+    type: noha
+    openstack: pike
+    sdncontroller:
+    - type: nosdn
+    storage:
+    - type: ceph
+      disk: /dev/sdb
+    feature: odl_l2
+    spaces:
+    - type: admin
+      bridge: brAdm
+      cidr: 10.10.191.0/24
+      gateway: 10.10.191.1
+      vlan:
+    - type: data
+      bridge: brData
+      cidr: 10.10.192.0/24
+      gateway:
+      vlan:
+    - type: storage
+      bridge: brStor
+      cidr: 10.10.193.0/24
+      gateway:
+      vlan:
+    - type: floating
+      bridge: brExt
+      cidr: 10.10.190.0/24
+      gateway:
+      vlan:
+#    - type: storage
+#      bridge: brMgmt
+#      cidr: 10.10.194.0/24
+#      gateway:
+#      vlan: 214
+    - type: public
+      bridge: brPublic
+      cidr: 10.10.195.0/24
+      gateway:
+      vlan: 4000
diff --git a/labconfig/lenovo/pod1/labconfig.yaml b/labconfig/lenovo/pod1/labconfig.yaml
index ab479420..fb8637eb 100644
--- a/labconfig/lenovo/pod1/labconfig.yaml
+++ b/labconfig/lenovo/pod1/labconfig.yaml
@@ -13,6 +13,9 @@ lab:
       - ifname: intf101
         spaces: [floating]
         mac: ["24:8a:07:3f:84:ad"]
+      - ifname: intf101.104
+        spaces: [public]
+        mac: ["24:8a:07:3f:84:ad"]
       power:
         type: ipmi
         address: 192.0.5.125
@@ -28,6 +31,9 @@ lab:
       - ifname: intf101
         spaces: [floating]
         mac: ["24:8a:07:3f:96:87"]
+      - ifname: intf101.104
+        spaces: [public]
+        mac: ["24:8a:07:3f:96:87"]
       power:
         type: ipmi
         address: 192.0.5.126
@@ -43,6 +49,9 @@ lab:
       - ifname: intf101
         spaces: [floating]
         mac: ["24:8a:07:3f:84:c5"]
+      - ifname: intf101.104
+        spaces: [public]
+        mac: ["24:8a:07:3f:84:c5"]
       power:
         type: ipmi
         address: 192.0.5.127
@@ -58,6 +67,9 @@ lab:
       - ifname: intf101
         spaces: [floating]
         mac: ["24:8a:07:3f:96:4f"]
+      - ifname: intf101.104
+        spaces: [public]
+        mac: ["24:8a:07:3f:96:4f"]
       power:
         type: ipmi
         address: 192.0.5.128
@@ -73,6 +85,9 @@ lab:
       - ifname: intf101
         spaces: [floating]
         mac: ["24:8a:07:3f:95:b7"]
+      - ifname: intf101.104
+        spaces: [public]
+        mac: ["24:8a:07:3f:95:b7"]
       power:
         type: ipmi
         address: 192.0.5.129
@@ -83,10 +98,10 @@ lab:
     dns: 8.8.8.8
     osdomainname:
 opnfv:
-    release: d
+    release: f
     distro: xenial
     type: nonha
-    openstack: Newton
+    openstack: pike
     sdncontroller:
     - type: nosdn
     storage:
@@ -100,10 +115,13 @@ opnfv:
       gateway: 192.0.5.5
       vlan:
     - type: floating
-      bridge: brPublic
       cidr: 172.21.159.0/24
       gateway: 172.21.159.1
       vlan:
+    - type: public
+      cidr: 172.22.159.0/24
+      gateway:
+      vlan: 104
     - type: external
       bridge: brExt
       cidr: