diff options
| author |   Praneta Paithankar <praneta.paithankar@intel.com> | 2018-07-10 08:52:54 -0700 |
|---|---|---|
| committer | Praneta Paithankar <praneta.paithankar@intel.com> | 2018-07-10 11:23:22 -0700 |
| commit | ab98f6a0db3df8f5232395d899e96462dbc11159 (patch) | |
| tree | 7fd890b2d117442fe4b3d30e8cb5881d6d2d9d31 /vnfs | |
| parent | fd761391ba59ba11452270807033e3605da5c6a4 (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 'vnfs')
| -rw-r--r-- | vnfs/vCPE/scripts/v_gw_install.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh index 6d3f6d8c..f5df26be 100644 --- a/vnfs/vCPE/scripts/v_gw_install.sh +++ b/vnfs/vCPE/scripts/v_gw_install.sh @@ -5,9 +5,9 @@ REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt) -VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/vpp_source_repo_branch.txt) +VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt) HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) -HC2VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/hc2vpp_source_repo_branch.txt) +HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) MUX_GW_IP=$(cat /opt/config/mux_gw_private_net_ipaddr.txt) MUX_GW_CIDR=$(cat /opt/config/mux_gw_private_net_cidr.txt) @@ -75,7 +75,7 @@ then #Download and build the VPP codes cd /opt - git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp + git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp cd vpp make install-dep @@ -239,7 +239,7 @@ then # Download and install HC2VPP from source cd /opt - git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp + git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp apt --allow-unauthenticated install -y python-ply-lex-3.5 python-ply-yacc-3.5 python-pycparser python-cffi apt-get install -y maven @@ -447,7 +447,7 @@ EOF sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub grub-mkconfig -o /boot/grub/grub.cfg sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules + #sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg reboot fi |