4 files changed, 148 insertions, 111 deletions
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
new file mode 100644
index 00000000..78c916ef
--- /dev/null
+++ b/labs/lf/idf-pod2.yaml
@@ -0,0 +1,73 @@
+##############################################################################
+# Copyright (c) 2017 Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### LF POD 5 installer descriptor file ###
+
+idf:
+  version: 0.1
+  net_config:
+    # NOTE: Network names are likely to change after the PDF spec is updated
+    oob:
+      interface: 0
+      ip-range: 172.30.8.65-172.30.8.75
+      vlan: 410
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0  # Untagged, 'PXE/Admin' on wiki, different IP
+      mask: 24
+    mgmt:
+      interface: 0
+      vlan: 300
+      network: 10.167.4.0    # Tagged, 'vlan 300' on wiki
+      mask: 24
+    storage:
+      interface: 3
+      vlan: 301
+      network: 10.2.0.0      # Tagged, not the same with 'storage' on wiki
+      mask: 24
+    private:
+      interface: 1
+      vlan: 1000
+      network: 10.1.0.0      # Tagged, not the same with 'private' on wiki
+      mask: 24
+    public:
+      interface: 2
+      vlan: native
+      network: 172.30.10.0   # Untagged, 'public' on wiki
+      mask: 24
+      gateway: 172.30.10.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: ''
+        mgmt: ''
+        private: ''
+        public: ''
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - ''
+            - ''
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - ''
+            - ''
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
new file mode 100644
index 00000000..e0e4af28
--- /dev/null
+++ b/labs/lf/idf-pod5.yaml
@@ -0,0 +1,70 @@
+##############################################################################
+# Copyright (c) 2017 Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### LF POD 5 installer descriptor file ###
+
+idf:
+  version: 0.1
+  net_config:
+    oob:
+      interface: 0
+      ip-range: 172.30.8.89-172.30.8.94
+      vlan: 410
+    admin:
+      interface: 0
+      vlan: native
+      network: 10.20.0.128
+      mask: 25
+      gateway: 10.20.0.129
+      dns: 10.20.0.129
+    mgmt:
+      interface: 1
+      vlan: 450
+      network: 192.168.0.128
+      mask: 25
+    storage:
+      interface: 2
+      vlan: 451
+      network: 192.168.1.128
+      mask: 25
+    private:
+      interface: 1
+      vlan: 452
+      network: 192.168.2.128
+      mask: 25
+    public:
+      interface: 2
+      vlan: 415
+      network: 172.30.13.64
+      mask: 26
+  fuel:
+    jumphost:
+      bridges:
+        admin: ''
+        mgmt: ''
+        private: ''
+        public: ''
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - ''
+            - ''
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - ''
+            - ''
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index e9ede116..6f684735 100644
--- a/labs/lf/pod2.yaml
+++ b/labs/lf/pod2.yaml
@@ -9,42 +9,6 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/LF+POD+2
 ##############################################################################
-net_config:
-  # NOTE: Network names are likely to change after the PDF spec is updated
-  oob:
-    interface: 0
-    ip-range: 172.30.8.65-172.30.8.75
-    vlan: 410
-  admin:
-    interface: 0
-    vlan: native
-    network: 192.168.11.0  # Untagged, 'PXE/Admin' on wiki, different IP
-    mask: 24
-  mgmt:
-    interface: 0
-    vlan: 300
-    network: 10.167.4.0    # Tagged, 'vlan 300' on wiki
-    mask: 24
-  storage:
-    interface: 3
-    vlan: 301
-    network: 10.2.0.0      # Tagged, not the same with 'storage' on wiki
-    mask: 24
-  private:
-    interface: 1
-    vlan: 1000
-    network: 10.1.0.0      # Tagged, not the same with 'private' on wiki
-    mask: 24
-  public:
-    interface: 2
-    vlan: native
-    network: 172.30.10.0   # Untagged, 'public' on wiki
-    mask: 24
-    gateway: 172.30.10.1
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-##############################################################################
 jumphost:
   name: pod2-jump
   node:
@@ -67,26 +31,8 @@ jumphost:
     type: ipmi
     versions:
       - 2.0
-    user: >
-        ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-        DQYJKoZIhvcNAQEBBQAEggEAKn4rdxFJum3vgvpjT4c64gkXzbMog4LyrBb0
-        pHeASLqwiuJqCdELWl4e7d4SMp3QBzHqd6aGHJqywDt09L7axFaW9PmdUEVx
-        KxIZ8NUdDjl7HtuG8D9irU2n5VMHXVyDosMEZe9pRYhQTkuAggR7EDoDjdDj
-        0myGFy/UVH3/fxpdySWhyg9kqAYb1ReMgYBudVfm2gw4bjtjJviwASXi8hj6
-        8isdJPf25U6wrvbqQi5J5WVD4Q3PaGy8GACTZ8n+LFyPSwBl3QJ5jfMmzHmq
-        Po0cqa4MoKi3xQ8Y8z6DxhUrV0yoYWoHvIcpQBu3YCZVzpOqVPZwsapBl963
-        0d0kWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAoo59BSqp1DBCu05h+
-        /1BZgBDdOvlZ5JlDtpkh73ujYZXR]
-    pass: >
-        ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-        DQYJKoZIhvcNAQEBBQAEggEA4pnLYg4U/39mKdytYH1CJYJuJ/qjNrS+KoON
-        oPU6G9lMJ5U5J7NUuGyBD7O1NTt8VBE+LaBEqmXK5/SQ6mAdns9qs5QLOVSm
-        r3WKroZdqH3hmW26LuPsXNUfTaCVNOqWPAf6U6Q1fHr1vi09n3mIV/Ph03Kv
-        /aNeeRsJbBPAtHgCL6aRs+4WoxxYS0eUAVCo4yPDiSN5UFmSg6O304NM2qzi
-        av2b/gmNFN8AxE5CVi+C/fVGBhdpwmmdC0KmtkY38pYa/hf8Pks4jsFtKNDw
-        3KW+pP+BTsgKs/o/WrwCFm4LIJj/E6Pf9qZ/mZ8bAxKlVf+gQj2bgxzT3aa1
-        hHhD0TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAx3f5XDjWzYJA4Jn5H
-        KJOBgBDq/YBNdEeyT+dCuH59ZE6L]
+    user: admin
+    pass: octopus
   remote_management:
     <<: *remote_params
     address: 172.30.8.83
diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index 7da6abcd..ffb1b90d 100644
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.yaml
@@ -8,40 +8,6 @@ details:
   location: Portland, Oregon, USA
   type: development
   link: https://wiki.opnfv.org/display/pharos/LF+POD+5
-
-net_config:
-  oob:
-    interface: 0
-    ip-range: 172.30.8.89-172.30.8.94
-    vlan: 410
-  admin:
-    interface: 0
-    vlan: native
-    network: 10.20.0.128
-    mask: 25
-    gateway: 10.20.0.129
-    dns: 10.20.0.129
-  mgmt:
-    interface: 1
-    vlan: 450
-    network: 192.168.0.128
-    mask: 25
-  storage:
-    interface: 2
-    vlan: 451
-    network: 192.168.1.128
-    mask: 25
-  private:
-    interface: 1
-    vlan: 452
-    network: 192.168.2.128
-    mask: 25
-  public:
-    interface: 2
-    vlan: 415
-    network: 172.30.13.64
-    mask: 26
-
 jumphost:
   name: pod5-jump
   node: &nodeparas
@@ -64,32 +30,14 @@ jumphost:
     type: ipmi
     versions:
       - 2.0
-    user: >
-        ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-        DQYJKoZIhvcNAQEBBQAEggEAR9BS+HE2rTstFbsIQBPMWkmza7bcE+g+6jJG
-        luOe/dNPi5Ez/ut7fZ28rb4+3cUgvXDLLVDNiBSjUpKa0QbJrybfSNoEuX+f
-        Sjaxom36hjHDn7J8wTG2T9KAPTxL1Kmc16T2i6cdpv8NUMOKhgwnhgqtYDco
-        MnOTDJve0tNh4kLDSWo26+KbnQ1HejfGLfNtG6R1fjg6BQMYp8lFo3q7ZRq4
-        nR34/mXW39eeiySmMoMmAQg2t21LW5GiHEBSphrUcoPchU6nl/oWOvc2agxb
-        Tf3hN75vumxN+3PpW8B7hj6TdaNCfmm1OL2WhrSTW1EpQEO0UXxAq7oLAF0D
-        K62KaTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBbeaV0wWXX3M668Mh1
-        CN+igBBApURxRAFMWQXtgAnbxlhr]
-    pass: >
-        ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
-        DQYJKoZIhvcNAQEBBQAEggEAFwQbOO4grEw452H7WOAwXN2sb566gisUNhNk
-        oOPdae4QLTD8Yu/pAjKIoQjyBgtmPwRJlocioIFJ2SpZfjlrVC4fIMULvmFJ
-        0CfuG77o950+XIFLdDrxqlEfOg7GetlByi6FdE+x4Cd4bc3SS4o1BIMFFn5R
-        NP/QeCJGS5RkEi+AcRLzS04Jq+CM0YCbeK0/M5EDBtgSpcQqNSxG9uARKVHy
-        bXaPso5/1RLwyEMXyMDtTSSJK6etjk4MxZjvMcKDCzSXq1SnrPS+VgjRhI2R
-        4Nx1aTm+0mRPtfwsXaaU6YZQLClS93QBQMHb3YsBO7/KqGL5jTpoT6K8AMyc
-        Q7r/JzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBO116CsJoAZzgnxo0Q
-        R8HRgBBYArsrg4jLeOnZNJP4/yOK]
+    user: admin
+    pass: octopus
   remote_management:
     <<: *remote_params
     address: 172.30.8.89
     mac_address: "a4:bf:01:01:ad:73"
   interfaces:
-    - mac_address: "00:1e:67:fd:ad:71"
+    - mac_address: "a4:bf:01:01:ad:71"
       speed: 1gb
       features: 'dpdk|sriov'
     - mac_address: "00:1e:67:fd:9c:c2"