From: Dave Urschatz <dave.urschatz@cengn.ca>
Date: Thu, 16 Jun 2016 19:55:32 +0000 (-0400)
Subject: cengnpod2 Invert data and storage networks to match jump host bridges
X-Git-Tag: colorado.1.0~127
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=19fdbab5b2ad2a0c8be810f1ad17c1108b9a29c5;p=joid.git

cengnpod2 Invert data and storage networks to match jump host bridges
JIRA: JOID-87

Change-Id: I1328089b33c7dd038f65a44c71545eed6e714240
Signed-off-by: Dave Urschatz <dave.urschatz@cengn.ca>
---

diff --git a/labconfig/cengn/pod2/labconfig.yaml b/labconfig/cengn/pod2/labconfig.yaml
index 1c089948..54326570 100644
--- a/labconfig/cengn/pod2/labconfig.yaml
+++ b/labconfig/cengn/pod2/labconfig.yaml
@@ -14,10 +14,10 @@ lab:
       - ifname: eth0
         spaces: [admin]
         mac: ["0c:c4:7a:3a:c5:b6"]
-      - ifname: eth2
+      - ifname: eth1
         spaces: [public]
         mac: ["0c:c4:7a:3a:c5:b7"]
-      - ifname: eth1
+      - ifname: eth2
         spaces: [data]
         mac: ["0c:c4:7a:1f:d7:f4"]
       - ifname: eth3
@@ -124,6 +124,7 @@ opnfv:
   - type: ceph
     disk: /dev/sdb /dev/sdc
   feature: odl_l2
+  #  Ensure the following configuration matches the bridge configuration on your jumphost
   spaces:
   - type: admin
     bridge: brAdm
@@ -132,12 +133,12 @@ opnfv:
     vlan:
   - type: data
     bridge: brData
-    cidr: 192.168.11.0/24
+    cidr: 192.168.21.0/24
     gateway:
     vlan:
   - type: storage
     bridge: brStorage
-    cidr: 192.168.21.0/24
+    cidr: 192.168.11.0/24
     gateway:
   - type: public
     bridge: brPublic