From: Tim Rozet <trozet@redhat.com>
Date: Fri, 6 Oct 2017 20:05:36 +0000 (+0000)
Subject: Merge "Use stable/17.10 branch for VPP"
X-Git-Tag: opnfv-6.0.0~74
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=325ac9a9d4582175b513219a45e08947e79599a9;hp=-c;p=apex.git

Merge "Use stable/17.10 branch for VPP"
---

325ac9a9d4582175b513219a45e08947e79599a9
diff --combined build/overcloud-full.sh
index ac412d90,13f0e59f..ada196df
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -48,7 -48,7 +48,7 @@@ qemu-img resize overcloud-full_build.qc
  # installing forked apex-puppet-tripleo
  # upload neutron port data plane status
  # REMOVE Tacker VNFFG patch when moving to Pike
 -LIBGUESTFS_BACKEND=direct virt-customize \
 +LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
      --run-command "xfs_growfs /dev/sda" \
      --upload ${BUILD_DIR}/apex-puppet-tripleo.tar.gz:/etc/puppet/modules \
      --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf apex-puppet-tripleo.tar.gz" \
@@@ -82,7 -82,7 +82,7 @@@
  # apply congress parallel execution patch
  # Requirements from Doctor project
  # TODO(cgoncalves): code merged in Pike dev cycle. drop from >= OpenStack Pike / > OPNFV Euphrates
 -LIBGUESTFS_BACKEND=direct virt-customize \
 +LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
      --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_lib_dps.patch " \
      --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_server_dps.patch" \
      --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_openstacksdk_dps.patch" \
@@@ -106,11 -106,11 +106,11 @@@ pushd puppet-fdio > /dev/nul
  git archive --format=tar.gz --prefix=fdio/ HEAD > ${BUILD_DIR}/puppet-fdio.tar.gz
  popd > /dev/null
  
- # Master FD.IO Repo
+ # FD.IO Repo
  cat > ${BUILD_DIR}/fdio.repo << EOF
- [fdio-master]
- name=fd.io master branch latest merge
- baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
+ [fdio-1710]
+ name=fd.io packages
+ baseurl=https://nexus.fd.io/content/repositories/fd.io.stable.1710.centos7/
  enabled=1
  gpgcheck=0
  EOF
@@@ -141,7 -141,7 +141,7 @@@ populate_cache $kvmfornfv_uri_base/$kvm
  # upload puppet fdio
  # git clone vsperf into the overcloud image
  # upload the rt_kvm kernel
 -LIBGUESTFS_BACKEND=direct virt-customize \
 +LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
      --run-command "mkdir /root/dpdk_rpms" \
      $dpdk_pkg_str \
      --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \