From: Tim Rozet <trozet@redhat.com>
Date: Thu, 18 Aug 2016 00:04:16 +0000 (+0000)
Subject: Merge "Adds fds networking-odl for ODL FDIO deployments"
X-Git-Tag: colorado.1.0~66
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3b37b935031b1db4a153eacb5019b0c3555486b1;p=apex.git

Merge "Adds fds networking-odl for ODL FDIO deployments"
---

3b37b935031b1db4a153eacb5019b0c3555486b1
diff --cc build/overcloud-opendaylight.sh
index 34a7be7d,160c5e96..9b63ebc5
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@@ -49,9 -49,8 +56,10 @@@ popd > /dev/nul
  # install ODL packages
  # install Jolokia for ODL HA
  # Patch in OPNFV custom puppet-tripleO
 +# install Honeycomb
 +# install Honeycomb puppet module
  LIBGUESTFS_BACKEND=direct virt-customize \
+     --upload networking-odl.tar.gz:/root/ \
      --upload /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
      --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
      --upload /tmp/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \