modified as per marks comments.

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

diff --git a/labconfig/intel/pod9/labconfig.yaml b/labconfig/intel/pod9/labconfig.yaml
index 91a5dec..2defa03 100644 (file)
--- 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