summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-05-04 14:34:07 -0400
committerFeng Pan <fpan@redhat.com>2017-05-04 14:34:07 -0400
commitbaaa7ac3cdc7984c97a4e1873ad118969ba95a01 (patch)
tree7cd750f75694df0a01dba4727a51a6c42457a0b2 /lib
parentaaa6cad0c1247d5f062bedaedc8df438fc02f746 (diff)
Enable OpenDaylight clustering mode for FDIO scenarios
JIRA: APEX-450 Change-Id: I6d570c19ff5286b1307e38eee439116839b1d612 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 4ef2ab10..6f1a09a8 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -182,15 +182,7 @@ EOI
-a overcloud-full.qcow2
EOI
- # Disable clustering for ODL FDIO HA scenarios
- if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
- ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
- LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /etc/puppet/modules/tripleo/ && patch -p1 < disable_odl_clustering.patch" \
- -a overcloud-full.qcow2
-EOI
- fi
-
- # Configure routing node for odl_l3-fdio
+ # Configure routing node for odl-fdio
if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
sed -i "/opendaylight::vpp_routing_node:/c\ opendaylight::vpp_routing_node: ${deploy_options_array['odl_vpp_routing_node']}.${domain_name}" ${ENV_FILE}