diff options
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index f9b66191..8cf1b043 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -232,15 +232,14 @@ EOI EOI fi - # Override any previous packages 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 - # LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \ - # --run-command "yum -y install /root/fdio_l2/*.rpm" \ - # --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ - # -a overcloud-full.qcow2 -#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 + 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 + fi # check if ceph should be enabled if [ "${deploy_options_array['ceph']}" == 'True' ]; then |