diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-10 20:57:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-10 20:57:19 +0000 |
| commit | 05954847525a0eab9db88ab6f327fb960e1fbd03 (patch) | |
| tree | 8235ad911e3b58ffa7ca603e4f6c408ae8f09d0d /lib | |
| parent | 1eb0a482d1fb563c8a8354796d483fa4383b12a8 (diff) | |
| parent | 5e376c3a4a3b655ec5974953e6798ac83f7bf8f3 (diff) | |
Merge "Fixes mismatch for Java APIs between HC and VPP and L2 pkgs"
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 |