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 /lib | |
| 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 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index d7e9b7e0..a46c6c6b 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -189,6 +189,14 @@ EOI EOI fi + # Override any previous packages if FDIO and L2 + if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-devel vpp-api-python vpp-lib vpp-plugins honeycomb" \ + --run-command "yum -y install /root/fdio_l2/*.rpm" \ + -a overcloud-full.qcow2 +EOI + fi # check if ceph should be enabled if [ "${deploy_options_array['ceph']}" == 'True' ]; then |