From: Marco Platania <platania@research.att.com>
Date: Thu, 16 Nov 2017 13:42:12 +0000 (+0000)
Subject: Merge "Update vfc release version"
X-Git-Tag: 1.0.0-Amsterdam~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=93d89b7c49dcd9de5fa18a4b5449639d0f70ae74;hp=b60071bcf11bdb01588c59554c6c1d5241a04837;p=demo.git

Merge "Update vfc release version"
---

diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh
index 4b4a7686..043fba5d 100644
--- a/vnfs/vCPE/scripts/v_gw_install.sh
+++ b/vnfs/vCPE/scripts/v_gw_install.sh
@@ -219,10 +219,7 @@ set dhcp client intfc ${GW_PUB_NIC} hostname vg-1
 tap connect lstack address 192.168.1.1/24
 set int state tap-0 up
 
-create vxlan tunnel src ${MUX_GW_IP} dst ${MUX_IP_ADDR} vni ${VG_VGMUX_TUNNEL_VNI}
-
 set interface l2 bridge tap-0 10 0
-set interface l2 bridge vxlan_tunnel0 10 1
 set bridge-domain arp term 10
 
 loopback create
@@ -239,7 +236,7 @@ fi  # endif BUILD_STATE != "build"
 if [[ $BUILD_STATE != "done" ]]
 then
 
-    # Download and install HC2VPP from source
+    # Download and install HC2VPP from source
     cd /opt
     git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp