Merge "Updates to Caching"

diff --cc build/overcloud-opendaylight.sh
index f7f8958,49c5f21..4f81a30
--- 1/build/overcloud-opendaylight.sh
--- 2/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@@ -52,20 -52,8 +52,19 @@@ enabled=
  gpgcheck=0
  EOF
  
 +#BGPVPN Repo
 +cat > /tmp/bgpvpn.repo << EOF
 +[bgpvpn]
 +name=bgpvpn
 +baseurl=https://trunk.rdoproject.org/centos7/consistent/
 +includepkgs=python2-networking-bgpvpn
 +enabled=1
 +gpgcheck=0
 +priority=1
 +EOF
 +
  # 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
- 
+ curl -fO https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
  
  # install ODL packages
  # install Jolokia for ODL HA

diff --cc ci/build.sh
Simple merge