Fix vGMUX building from snapshot dependency issues

The vgmux env, yaml, install script, and  hc2vpp patch files were edited to remove snapshot dependencies.

Change-Id: Ibfdef8cf35013c4fea8254437d12098a0bb82575
Issue-ID: INT-525
Signed-off-by: Enyinna Ochulor <enyinna.ochulor@intel.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index 663408e8..8f495409 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -29,9 +29,9 @@
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
   cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
   vpp_source_repo_url: https://gerrit.fd.io/r/vpp
-  vpp_source_repo_branch: stable/1704
+  vpp_source_repo_release_tag: v17.04
   hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp
-  hc2vpp_source_repo_branch: stable/1704
+  hc2vpp_source_repo_release_tag: v1.17.04
   vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch
   hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch
   libevel_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
index 43bbb986..b08d5c3c 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -153,18 +153,18 @@ parameters:
     type: string
     label: VPP Source Git Repo
     description: URL for VPP source codes
-  vpp_source_repo_branch:
+  vpp_source_repo_release_tag:
     type: string
-    label: VPP Source Git Branch
-    description: Git Branch for the VPP source codes
+    label: VPP Source Git Release Tag
+    description: Git Tag for the VPP source codes
   hc2vpp_source_repo_url:
     type: string
     label: Honeycomb Source Git Repo
     description: URL for Honeycomb source codes
-  hc2vpp_source_repo_branch:
+  hc2vpp_source_repo_release_tag:
     type: string
-    label: Honeycomb Source Git Branch
-    description: Git Branch for the Honeycomb source codes
+    label: Honeycomb Source Git Release Tag
+    description: Git Tag for the Honeycomb source codes
   vpp_patch_url:
     type: string
     label: VPP Patch URL
@@ -254,9 +254,9 @@ resources:
             __install_script_version__ : { get_param: install_script_version }
             __cloud_env__ : { get_param: cloud_env }
             __vpp_source_repo_url__ : { get_param: vpp_source_repo_url }
-            __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch }
+            __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag }
             __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
-            __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
+            __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag }
             __vpp_patch_url__ : { get_param: vpp_patch_url }
             __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url }
             __libevel_patch_url__ : { get_param: libevel_patch_url }
@@ -279,10 +279,10 @@ resources:
             echo "__install_script_version__" > /opt/config/install_script_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt
-            echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt
+            echo "__vpp_source_repo_release_tag__" > /opt/config/vpp_source_repo_release_tag.txt
             echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt
             echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt
-            echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt
+            echo "__hc2vpp_source_repo_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.txt
             echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt
             echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt