From: Tim Rozet <trozet@redhat.com>
Date: Thu, 4 May 2017 18:22:25 +0000 (+0000)
Subject: Merge "Enable OpenDaylight clustering mode for FDIO scenarios"
X-Git-Tag: opnfv-5.0.0~149
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fcd5a75810ed9167baf6e5da4ab20b59f7ab1de4;p=apex.git

Merge "Enable OpenDaylight clustering mode for FDIO scenarios"
---

fcd5a75810ed9167baf6e5da4ab20b59f7ab1de4
diff --cc build/overcloud-opendaylight.sh
index 4a6738b3,7c78b6c4..d61c1f2e
--- a/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