From baaa7ac3cdc7984c97a4e1873ad118969ba95a01 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Thu, 4 May 2017 14:34:07 -0400
Subject: Enable OpenDaylight clustering mode for FDIO scenarios

JIRA: APEX-450

Change-Id: I6d570c19ff5286b1307e38eee439116839b1d612
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 lib/overcloud-deploy-functions.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'lib')

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}
-- 
cgit 1.2.3-korg