[PDF] lf-pod*: Drop 'fixed_ips'

Drop 'fixed_ips', which is a leftover from early net_config
implementation.
To maintain compatibility with the only 'fixed_ips' consumer (Daisy),
add 'address' on the first jumpserver interface to leverage Daisy's
fallback path for determining the gateway.

While at it, add/update copyright headers.

Fixes: c01d68e

Change-Id: I8dc386535a20d64593eccc9abd8ee8d1ef27decf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
index c3ad171..a2c0096 100644 (file)
--- a/labs/lf/idf-pod2.yaml
+++ b/labs/lf/idf-pod2.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# 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

diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
index b7d05cf..59064f3 100644 (file)
--- a/labs/lf/idf-pod5.yaml
+++ b/labs/lf/idf-pod5.yaml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# 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

diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index 6f68473..3c5502c 100644 (file)
--- 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

diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index ffb1b90..9c14cc6 100644 (file)
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.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 5 descriptor file ###
 
@@ -40,16 +47,13 @@ jumphost:
     - mac_address: "a4:bf:01:01:ad:71"
       speed: 1gb
       features: 'dpdk|sriov'
+      address: 10.20.0.129
     - mac_address: "00:1e:67:fd:9c:c2"
       speed: 10gb
       features: 'dpdk|sriov'
     - mac_address: "00:1e:67:fd:9c:c3"
       speed: 10gb
       features: 'dpdk|sriov'
-  fixed_ips:
-    admin: 10.20.0.129
-    mgmt: 192.168.0.130
-    public: 172.30.13.89
 nodes:
   - name: pod5-node1
     node: *nodeparas
@@ -68,10 +72,6 @@ nodes:
       - mac_address: "00:1e:67:f6:9b:35"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.130
-      mgmt: 192.168.0.131
-      public: 172.30.13.90
   - name: pod5-node2
     node: *nodeparas
     disks: *disks
@@ -89,10 +89,6 @@ nodes:
       - mac_address: "00:1e:67:f6:9b:37"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.131
-      mgmt: 192.168.0.132
-      public: 172.30.13.91
   - name: pod5-node3
     node: *nodeparas
     disks: *disks
@@ -110,10 +106,6 @@ nodes:
       - mac_address: "00:1e:67:fd:9c:b1"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.132
-      mgmt: 192.168.0.133
-      public: 172.30.13.92
   - name: pod5-node4
     node: *nodeparas
     disks: *disks
@@ -131,10 +123,6 @@ nodes:
       - mac_address: "00:1e:67:fd:99:25"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.133
-      mgmt: 192.168.0.134
-      public: 172.30.13.93
   - name: pod5-node5
     node: *nodeparas
     disks: *disks
@@ -152,7 +140,3 @@ nodes:
       - mac_address: "00:1e:67:f6:9b:97"
         speed: 10gb
         features: 'dpdk|sriov'
-    fixed_ips:
-      admin: 10.20.0.134
-      mgmt: 192.168.0.135
-      public: 172.30.13.94