Merge "Enable OpenDaylight clustering mode for FDIO scenarios"

diff --cc build/overcloud-opendaylight.sh
index 4a6738b,7c78b6c..d61c1f2
--- 1/build/overcloud-opendaylight.sh
--- 2/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@@ -110,10 -110,7 +110,9 @@@ LIBGUESTFS_BACKEND=direct virt-customiz
      --run-command "yum downgrade -y python-zmq-14.3.1" \
      --install zeromq-4.1.4 \
      --install capnproto-libs,capnproto \
 +    --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
 +    --run-command "sudo usermod -a -G quaggavt quagga" \
      --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
-     --upload ${BUILD_ROOT}/patches/disable_odl_clustering.patch:/etc/puppet/modules/tripleo/ \
      --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \
      -a overcloud-full-opendaylight_build.qcow2
  

diff --cc lib/overcloud-deploy-functions.sh
Simple merge