commit 279fabf3885f087d5581be8c1c0a324764712e14
author Charles Chan <rascov@gmail.com> Mon Apr 24 15:33:14 2017 -0700
committer Charles Chan <rascov@gmail.com> Mon Apr 24 15:33:14 2017 -0700
tree 582d15a0203fe0232044286a576f6dfafaea458f
parent ebfcc91241fcc154d5f4214d952f35cc048e1820

Share the same physical port between Quagga and compute node by using different VLAN tag

Change-Id: Id82786a0ea467b47783fa7fa58b87ab187927ff2

trellis/trellis_vlan.json

diff --git a/trellis/trellis_vlan.json b/trellis/trellis_vlan.json
index 798e0e2..f08093b 100644
--- a/trellis/trellis_vlan.json
+++ b/trellis/trellis_vlan.json
@@ -43,8 +43,9 @@
         "of:0000000000000205/4" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
+                    "ips" : [ "10.0.3.254/24", "10.0.1.254/24", "2000::1ff/120" ],
+                    "vlan-tagged": [10],
+                    "vlan-native": 30
                 }
             ]
         },
@@ -79,14 +80,6 @@
                     "vlan-untagged": 10
                 }
             ]
-        },
-        "of:0000000000000205/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
         }
     },
     "devices" : {