summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-03-24 22:03:04 -0400
committerTim Rozet <trozet@redhat.com>2017-03-26 14:43:55 +0000
commit1c1ced47444ccd92a4bbf4d7a0ac78932baf9027 (patch)
treec4e7f4e6c982ce0c032d6a02c64b61f0c6a95081
parent4cdcfa9d933dba8ffd43e034be00e58a5b9501ab (diff)
Replace ODL version for odl_l2-fdio scenario
Change-Id: I9e6c8c001c4324a936ad11ecea7eb34b0bbb83b2 Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit 59e92f9ac358d6d055fa051a3aaa4e6b5a88f558)
-rwxr-xr-xlib/overcloud-deploy-functions.sh17
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index f9b6619..8cf1b04 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