summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-07-12 11:04:15 -0400
committerFeng Pan <fpan@redhat.com>2017-07-13 09:47:14 -0400
commit18f7efa0bc0b0cb9724dbf845ceec671d34a1e75 (patch)
treec70b423be72c226d9df7bc6c24786aabbfdf3b1f /lib/overcloud-deploy-functions.sh
parent30fbb001c3efd19781403a15176f240f0c027036 (diff)
Update ODL version for fdio_l2 and fdio_l3 scenariosdanube.3.1stable/danube
Change-Id: Iaa44b21ee92f601f645e350177c6ba56c140649d Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 445f5fb..ed45451 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -282,13 +282,22 @@ EOI
fi
fi
- # Override ODL if we enable netvirt for fdio
+ # Override ODL for fdio scenarios
if [[ "${deploy_options_array['odl_vpp_netvirt']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; 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/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm" \
-a overcloud-full.qcow2
EOI
+ elif [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
+ if [[ "${deploy_options_array['odl_vpp_routing_node']}" != 'dvr' ]]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \
+ --run-command "tar zxvf /root/fdio_odl_carbon.tar.gz -C /opt/opendaylight/ --strip-components=1" \
+ --run-command "chown odl:odl -R /opt/opendaylight" \
+ -a overcloud-full.qcow2
+EOI
+ fi
fi
# check if ceph should be enabled