diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-29 21:11:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-29 21:11:05 +0000 |
| commit | bb4358f417fcd9a24017241725d00b5689df286e (patch) | |
| tree | db59acbab38cec69065ad92cb21bc090a7989c64 /lib | |
| parent | eb69165f0dcebf41cccfc3124f980bab53908a2d (diff) | |
| parent | 621bfd97aa74877177039ada39c0c8f9578a0220 (diff) | |
Merge "Pins ODL L3 VPP/HC packages"
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 37e8229b..e7abdd03 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -264,12 +264,20 @@ EOI fi # Override ODL if FDIO and ODL L2 - if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then + if [ "${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" \ --run-command "yum -y install /root/fdio_l2/opendaylight*.rpm" \ -a overcloud-full.qcow2 EOI + else + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \ + --run-command "yum -y install /root/fdio_l3/*.rpm" \ + -a overcloud-full.qcow2 +EOI + fi fi # check if ceph should be enabled |