summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorPraneta Paithankar <praneta.paithankar@intel.com>2018-07-10 08:52:54 -0700
committerPraneta Paithankar <praneta.paithankar@intel.com>2018-07-10 11:23:22 -0700
commitab98f6a0db3df8f5232395d899e96462dbc11159 (patch)
tree7fd890b2d117442fe4b3d30e8cb5881d6d2d9d31 /heat
parentfd761391ba59ba11452270807033e3605da5c6a4 (diff)
Fix VPP vCPE VNF vGW image build issue
The honeycomb software of VPP vCPE vGW image can not built. The builds were dependent on snapshot artifacts. These artifacts have now disappeared from upstream fd.io nexus. vGW heat template files i.e. base_vcpe_vgw.env and base_vcpe_vgw.yaml are modified. Now heat templates work with release tag of vpp and hc2vpp repositories. v_gw_install.sh is modified accordingly. Issue-ID: INT-525 Change-Id: I61d9d313ff619729b54cbda959d5daeec557c5b6 Signed-off-by: Praneta Paithankar <praneta.paithankar@intel.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.env4
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.yaml20
2 files changed, 12 insertions, 12 deletions
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env
index 65468124..5a08b91b 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw.env
@@ -29,6 +29,6 @@
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
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml
index c4b98760..07aa2174 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.yaml
+++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml
@@ -145,18 +145,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 release 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 release tag for the Honeycomb source codes
mux_ip_addr:
type: string
label: vGMUX IP address
@@ -238,9 +238,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 }
__mux_ip_addr__: { get_param: mux_ip_addr }
__vg_vgmux_tunnel_vni__: { get_param: vg_vgmux_tunnel_vni }
template: |
@@ -259,9 +259,9 @@ 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 "__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 "__mux_ip_addr__" > /opt/config/mux_ip_addr.txt
echo "__vg_vgmux_tunnel_vni__" > /opt/config/vg_vgmux_tunnel_vni.txt