From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 14 Feb 2018 20:28:52 +0000 (-0800)
Subject: [IDF] LF-POD5
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=009a022d882406e8fc0445d0eff8b22eef72d2c7;p=pharos.git

[IDF] LF-POD5

Update networks for LF-POD5 since discovering there is a bug using
non-/24 networks with Fuel, and to ensure there is no overlap with
LF-POD4.

Change-Id: Ie6eb6f12e8fd2831355e8bcec064e152cdc02f27
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
index fb93fde9..c1af4ed8 100644
--- a/labs/lf/idf-pod5.yaml
+++ b/labs/lf/idf-pod5.yaml
@@ -18,30 +18,32 @@ idf:
     admin:
       interface: 0
       vlan: native
-      network: 10.20.0.128
-      mask: 25
-      gateway: 10.20.0.129
-      dns: 10.20.0.129
+      network: 192.168.11.0
+      mask: 24
     mgmt:
       interface: 1
       vlan: 450
-      network: 192.168.0.128
-      mask: 25
+      network: 192.168.0.0
+      mask: 24
     storage:
       interface: 2
       vlan: 451
-      network: 192.168.1.128
-      mask: 25
+      network: 192.168.1.0
+      mask: 24
     private:
       interface: 1
       vlan: 452
-      network: 192.168.2.128
-      mask: 25
+      network: 192.168.2.0
+      mask: 24
     public:
       interface: 2
       vlan: 415
       network: 172.30.13.64
       mask: 26
+      gateway: 172.30.13.1
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
   fuel:
     jumphost:
       bridges:
diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index 61ca3ebe..47ebc9e8 100644
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.yaml
@@ -18,7 +18,7 @@ details:
   link: https://wiki.opnfv.org/display/pharos/LF+POD+5
 jumphost:
   name: pod5-jump
-  node: &nodeparas
+  node: &nodeparams
     type: baremetal
     vendor: Intel Corporation
     model: S2600WT2R
@@ -48,7 +48,7 @@ jumphost:
     - mac_address: "a4:bf:01:01:ad:71"
       speed: 1gb
       features: 'dpdk|sriov'
-      address: 10.20.0.129
+      address: 192.168.11.1
       name: 'nic1'
     - mac_address: "00:1e:67:fd:9c:c2"
       speed: 10gb
@@ -60,7 +60,7 @@ jumphost:
       name: 'nic3'
 nodes:
   - name: pod5-node1
-    node: *nodeparas
+    node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remote_params
@@ -80,7 +80,7 @@ nodes:
         features: 'dpdk|sriov'
         name: 'nic3'
   - name: pod5-node2
-    node: *nodeparas
+    node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remote_params
@@ -100,7 +100,7 @@ nodes:
         features: 'dpdk|sriov'
         name: 'nic3'
   - name: pod5-node3
-    node: *nodeparas
+    node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remote_params
@@ -120,7 +120,7 @@ nodes:
         features: 'dpdk|sriov'
         name: 'nic3'
   - name: pod5-node4
-    node: *nodeparas
+    node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remote_params
@@ -140,7 +140,7 @@ nodes:
         features: 'dpdk|sriov'
         name: 'nic3'
   - name: pod5-node5
-    node: *nodeparas
+    node: *nodeparams
     disks: *disks
     remote_management:
       <<: *remote_params