summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-27 11:54:39 -0400
committerTim Rozet <trozet@redhat.com>2017-03-27 23:12:53 +0000
commitb94ca9c7d72d7abbc3c011818eec125067c008b9 (patch)
treee0f7cd916ba291362ee09935b569933997d49fae /lib
parent33828db100ef502c8ef4eb66380d10a83a08d182 (diff)
Disables ODL clustering for FDIO+ODL scenarios
ODL clustering has issues with VPP mounting, so we are disabling clustering for now and should have the bug in ODL fixed by Danube 2.0. Change-Id: I19b9c9167596105a3197de8c5a537bed1280f241 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit 5108498adb2870581cc5a4bb99db693a05ff9c3b)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 8f5b1a21..612f91e1 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -169,6 +169,15 @@ EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
-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
if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI