X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=labs%2Flf%2Fpod2.yaml;fp=labs%2Flf%2Fpod2.yaml;h=3c5502ccce6e853dca5376ed1aa61c8ee76b321a;hb=e90ad8ca2c2b633ad13a8d533b555e09fb22f27b;hp=6f6847356c75d84774c04904dd9a750aacaa306f;hpb=6e219065020ced168c5c842e417e1c7875ddbcb0;p=pharos.git

diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index 6f684735..3c5502cc 100644
--- a/labs/lf/pod2.yaml
+++ b/labs/lf/pod2.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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 2 descriptor file ###
 
@@ -41,6 +48,7 @@ jumphost:
     - mac_address: "00:25:b5:a0:00:1a"
       speed: 40gb
       features: 'dpdk|sriov'
+      address: 192.168.11.1
     - mac_address: "00:25:b5:a0:00:1b"
       speed: 40gb
       features: 'dpdk|sriov'
@@ -50,10 +58,6 @@ jumphost:
     - mac_address: "00:25:b5:a0:00:1d"
       speed: 40gb
       features: 'dpdk|sriov'
-  fixed_ips:
-    admin: 192.168.11.1
-    mgmt: 10.167.4.1
-    public: 172.30.10.72
 ##############################################################################
 nodes:
   - name: pod2-node1
@@ -84,10 +88,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:2d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.2
-      mgmt: 10.167.4.2
-      public: 172.30.10.2
   ############################################################################
   - name: pod2-node2
     node: *nodeparams
@@ -109,10 +109,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:3d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.3
-      mgmt: 10.167.4.3
-      public: 172.30.10.3
   ############################################################################
   - name: pod2-node3
     node: *nodeparams
@@ -134,10 +130,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:4d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.4
-      mgmt: 10.167.4.4
-      public: 172.30.10.4
   ############################################################################
   - name: pod2-node4
     node: *nodeparams
@@ -159,10 +151,6 @@ nodes:
       - mac_address: "00:25:b5:a0:00:5d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.5
-      mgmt: 10.167.4.5
-      public: 172.30.10.5
   ############################################################################
   - name: pod2-node5
     node: *nodeparams
@@ -184,7 +172,3 @@ nodes:
       - mac_address: "00:25:b5:a0:00:6d"
         speed: 40gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 192.168.11.6
-      mgmt: 10.167.4.6
-      public: 172.30.10.6