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

diff --combined build/overcloud-opendaylight.sh
index 34a7be7,160c5e9..9b63ebc
--- 1/build/overcloud-opendaylight.sh
--- 2/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@@ -18,6 -18,13 +18,13 @@@ cp -f overcloud-full.qcow2 overcloud-fu
  #####    Adding OpenDaylight to overcloud #####
  ###############################################
  
+ # tar up fdio networking-odl
+ rm -rf fds
+ git clone https://gerrit.opnfv.org/gerrit/fds
+ pushd fds > /dev/null
+ tar -czvf ../networking-odl.tar.gz networking-odl
+ popd > /dev/null
+ 
  # Beryllium Repo
  cat > /tmp/opendaylight.repo << EOF
  [opendaylight-4-release]
@@@ -39,19 -46,11 +46,20 @@@ EO
  # SDNVPN - Copy tunnel setup script
  wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
  
 +# tar up the honeycomb module
 +rm -rf puppet-honeycomb
 +git clone https://github.com/trozet/puppet-honeycomb
 +pushd puppet-honeycomb > /dev/null
 +git archive --format=tar.gz --prefix=honeycomb/ HEAD > ../puppet-honeycomb.tar.gz
 +popd > /dev/null
 +
  # 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 \
@@@ -59,9 -58,6 +67,9 @@@
      --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
      --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
      --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
 +    --run-command "yum -y install https://github.com/marosmars/files/raw/master/honeycomb-1.0.0-99.noarch.rpm" \
 +    --upload puppet-honeycomb.tar.gz:/etc/puppet/modules \
 +    --run-command "cd /etc/puppet/modules && tar xzf puppet-honeycomb.tar.gz" \
      --upload ./setup_TEPs.py:/tmp \
      -a overcloud-full-opendaylight_build.qcow2