Merge "Updated the docker version"

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index da2f934..7da7120 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -146,21 +146,21 @@ parameters:
   dgbuilder_docker: v0.1.0
   cli_docker: v1.1.0
 
-  vfc_nokia_docker: 1.0.2-STAGING-latest
-  vfc_ztevmanagerdriver_docker: 1.0.2-STAGING-latest
-  vfc_ztesdncdriver_docker: 1.0.0-STAGING-latest
-  vfc_vnfres_docker: 1.0.1-STAGING-latest
-  vfc_vnfmgr_docker: 1.0.1-STAGING-latest
-  vfc_vnflcm_docker: 1.0.1-STAGING-latest
-  vfc_resmanagement_docker: 1.0.0-STAGING-latest
-  vfc_nslcm_docker: 1.0.2-STAGING-latest
-  vfc_huawei_docker: v1.0.0
-  vfc_jujudriver_docker: 1.0.0-STAGING-latest
-  vfc_gvnfmdriver_docker: 1.0.1-STAGING-latest
-  vfc_emsdriver_docker: 1.0.1-STAGING-latest
-  vfc_catalog_docker: 1.0.2-STAGING-latest
-  vfc_wfengine_mgrservice_docker: 1.0.0-STAGING-latest
-  vfc_wfengine_activiti_docker: 1.0.0-STAGING-latest
+  vfc_nokia_docker: v1.0.2
+  vfc_ztevmanagerdriver_docker: v1.0.2
+  vfc_ztesdncdriver_docker: v1.0.0
+  vfc_vnfres_docker: v1.0.1
+  vfc_vnfmgr_docker: v1.0.1
+  vfc_vnflcm_docker: v1.0.1
+  vfc_resmanagement_docker: v1.0.0
+  vfc_nslcm_docker: v1.0.2
+  vfc_huawei_docker: v1.0.2
+  vfc_jujudriver_docker: v1.0.0
+  vfc_gvnfmdriver_docker: v1.0.1
+  vfc_emsdriver_docker: v1.0.1
+  vfc_catalog_docker: v1.0.2
+  vfc_wfengine_mgrservice_docker: v1.0.0
+  vfc_wfengine_activiti_docker: v1.0.0
 
   #####################
   #                   #

diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh
index 4b4a768..043fba5 100644 (file)
--- 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\ 2 source
+    # Download and install HC2VPP from source
     cd /opt
     git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp