aboutsummaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorEric Multanen <eric.w.multanen@intel.com>2017-10-17 01:25:31 -0700
committerEric Multanen <eric.w.multanen@intel.com>2017-10-17 01:34:18 -0700
commit02977bf425c1e2039174065502f385a135caa5ee (patch)
tree89b454a577b14aff7b5d633d3011a7d7bbee60ba /heat
parentf79590758d6cce11b10d9257af798c8f8bc10f1e (diff)
Fixes for vCPE vG-MUX install script
Addresses the following items: - Do not setup auto configuration for eth1 and eth3 These interfaces will be used by vpp so they need to be down - Fix pci bus numbering for vpp interfaces - Fixes to properly create the 'save_config' script - Install linux-image-extra package to get uio_pci_generic driver module for the vpp dpdk interfaces - fix build of honeycomb so the jvpp-ves module built by vpp can be found - Patch libevel.so code to tweak the VES data produced so that sourceId and sourceName come from the openstack vnf_id property (instead of vm_uuid and vm_name) Issue-ID: INT-63 Change-Id: I469c2377df9dd9920a5769628b2b14d043d55d63 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.env1
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.yaml6
2 files changed, 7 insertions, 0 deletions
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index aad4784b..e81afa70 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -32,3 +32,4 @@
hc2vpp_source_repo_branch: stable/1704
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 4f12c64e..ecdb1b1b 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml
@@ -165,6 +165,10 @@ parameters:
type: string
label: Honeycomb Patch URL
description: URL for Honeycomb patch for vG-MUX
+ libevel_patch_url:
+ type: string
+ label: libevel Patch URL
+ description: URL for libevel patch for vG-MUX
#############
# #
@@ -245,6 +249,7 @@ resources:
__hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
__vpp_patch_url__ : { get_param: vpp_patch_url }
__hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url }
+ __libevel_patch_url__ : { get_param: libevel_patch_url }
template: |
#!/bin/bash
@@ -267,6 +272,7 @@ resources:
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_patch_url__" > /opt/config/hc2vpp_patch_url.txt
+ echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_gmux_install.sh -o /opt/v_gmux_install.sh