diff options
| author |   Mariah Jacobs <mariah.jacobs@intel.com> | 2018-07-12 06:39:00 -0700 |
|---|---|---|
| committer | Mariah Jacobs <mariah.jacobs@intel.com> | 2018-07-12 06:54:03 -0700 |
| commit | 72c50bbaf6cf4f98f141d4a275605975c6fda170 (patch) | |
| tree | 821a4774d476e69e7958a9b09dd52b63910f88e6 /heat/vCPE | |
| parent | d47f0cd6bb286fa013bcc1bf7321cdbc37cac400 (diff) | |
Update vCPE vBNG vpp to released version
Maintain consistency across VNFs with the snapshot dependency build fix.
Checkout vpp released code rather than stable branch.
Modify heat and env template parameters to specify release tag is checked out.
Issue-ID: INT-525
Change-Id: I190f47053a593040fe0cbfbda1da2fbef839e3fc
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>
Diffstat (limited to 'heat/vCPE')
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.yaml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index c702178b..09a5b3bb 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -32,5 +32,5 @@ 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 vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index b2ae4e6f..b6da581a 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -161,10 +161,10 @@ 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 vpp_patch_url: type: string label: VPP Patch URL @@ -259,7 +259,7 @@ 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 } __vpp_patch_url__ : { get_param: vpp_patch_url } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } template: | @@ -283,7 +283,7 @@ 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 "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt |