diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-28 17:27:48 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-10 11:42:38 -0500 |
| commit | 5e376c3a4a3b655ec5974953e6798ac83f7bf8f3 (patch) | |
| tree | 9196573f671b4a006200f2f23e6d442794edf992 /build/overcloud-full.sh | |
| parent | c6cfe5ee1177728db51b65eb795679c3bb7c59c2 (diff) | |
Fixes mismatch for Java APIs between HC and VPP and L2 pkgs
This copies the same API jars used for VPP to the Honeycomb to help
workaround the issues we are facing of incompatible Java APIs between HC
and VPP versions. It also locks vpp/honeycomb/odl to known working
packages for L2 scenarios.
Also increases overcloud disk +400MB to accomodate more vpp pkgs.
opnfv-tht-pr: 122
Change-Id: Id803834e1f1fa352778784da9ac246ab9c58a3b1
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index b94c0cb0..4222b278 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -80,8 +80,15 @@ EOF # Get Real Time Kernel from kvm4nfv populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm -# Increase disk size by 500MB to accommodate more packages -qemu-img resize overcloud-full_build.qcow2 +500MB +# ODL/FDIO packages frozen for L2 scenarios +fdio_l2_pkg_str='' +for package in ${fdio_l2_pkgs[@]}; do + wget "$fdio_l2_uri_base/$package" + fdio_l2_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l2/" +done + +# Increase disk size by 900MB to accommodate more packages +qemu-img resize overcloud-full_build.qcow2 +900MB # expand file system to max disk size # installing forked opnfv-puppet-tripleo @@ -105,9 +112,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "mkdir /root/dpdk_rpms" \ --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ - --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-api-python vpp-plugins" \ + --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-api-python vpp-plugins vpp-api-java" \ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \ --run-command "yum install -y /root/fdio/*.rpm" \ + --run-command "mkdir /root/fdio_l2" \ + $fdio_l2_pkg_str \ --run-command "yum install -y etcd" \ --install python-etcd \ --run-command "puppet module install cristifalcas/etcd" \ |