correct the interface name in intel pod5 labconfig.

[joid.git] / labconfig / intel / pod5 / labconfig.yaml

diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index f671a24..4fbe1b6 100644 (file)
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -7,80 +7,114 @@ lab:
       architecture: x86_64
       roles: [network,control]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:CF:BB:54"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: ens785f1.504
+        spaces: [public]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
-        address: 10.2.117.81
+        address: 10.2.117.85
         user: root
         pass: root
     - name: rack-5-m2
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:CF:B8:93"]
-      - ifname: eth4
-         spaces: [data]
-         mac: ["90:E2:BA:84:08:B8"]
+      - ifname: ens785f0
+        spaces: [data]
+        mac: ["90:E2:BA:84:08:B8"]
+      - ifname: ens785f1.504
+        spaces: [public]
+        mac: ["90:E2:BA:84:08:B9"]
       power:
         type: ipmi
-        address: 10.2.117.82
+        address: 10.2.117.86
         user: root
         pass: root
     - name: rack-5-m3
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:E0:08:7F"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:84:07:0D"]
+      - ifname: ens785f1.504
+        spaces: [public]
+        mac: ["90:E2:BA:84:07:0E"]
       power:
         type: ipmi
-        address: 10.2.117.83
+        address: 10.2.117.87
         user: root
         pass: root
     - name: rack-5-m4
       architecture: x86_64
       roles: [compute,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:E0:08:B1"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:83:FD:80"]
+      - ifname: ens785f1.504
+        spaces: [public]
+        mac: ["90:E2:BA:83:FD:81"]
       power:
         type: ipmi
-        address: 10.2.117.84
+        address: 10.2.117.88
         user: root
         pass: root
     - name: rack-5-m5
       architecture: x86_64
       roles: [compute,storage]
       nics:
-      - ifname: eth1
+      - ifname: enp4s0f3
         spaces: [admin]
         mac: ["00:1E:67:E0:0A:4B"]
-      - ifname: eth4
+      - ifname: ens785f0
         spaces: [data]
         mac: ["90:E2:BA:75:22:74"]
+      - ifname: ens785f1.504
+        spaces: [public]
+        mac: ["90:E2:BA:75:22:75"]
       power:
         type: ipmi
-        address: 10.2.117.85
+        address: 10.2.117.89
         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"
+#    - name: rack-5-m6
+#      architecture: x86_64
+#      roles: [compute,storage]
+#      nics:
+#      - ifname: enp4s0f3
+#        spaces: [admin]
+#        mac: ["98:4F:EE:10:03:43"]
+#      - ifname: ens785f0
+#        spaces: [data]
+#        mac: ["00:1E:67:9C:3E:54"]
+#      - ifname: ens785f1.504
+#        spaces: [public]
+#        mac: ["00:1E:67:9C:3E:55"]
+#      power:
+#        type: ipmi
+#        address: 10.2.117.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: "ens785f0.505"
     dns: 8.8.8.8
+    osdomainname:
 opnfv:
     release: c
     distro: trusty
@@ -90,7 +124,7 @@ opnfv:
     - type: nosdn
     storage:
     - type: ceph
-      disk: /srv
+      disk: /dev/sdb
     feature: odl_l2
     spaces:
     - type: admin
@@ -103,14 +137,24 @@ opnfv:
       cidr: 10.5.12.0/24
       gateway:
       vlan:
+    - type: storage
+      bridge: brStor
+      cidr: 10.5.13.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: 10.5.15.254
-      vlan:
+      gateway:
+      vlan: 505
     - type: external
       bridge: brExt
       cidr:
       gateway:
-      ipaddress: 10.2.117.86
+      ipaddress: 10.2.117.92
       vlan: