Merge "Adapting BGPVPN scenario to new composable service"

diff --combined build/overcloud-opendaylight.sh
index 9165200,33d4dd1..12b47f1
--- 1/build/overcloud-opendaylight.sh
--- 2/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@@ -36,16 -36,6 +36,6 @@@ git checkout stable/boro
  git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-boron.tar.gz
  popd > /dev/null
  
- # cache networking-BGPVPN
- populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm
- populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm
- populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm
- populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm
- populate_cache https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm
- pushd ${CACHE_DIR}/ > /dev/null
- tar czf ${BUILD_DIR}/networking-bgpvpn.tar.gz *networking-bgpvpn*
- popd > /dev/null
- 
  # cache gluon
  populate_cache http://artifacts.opnfv.org/netready/$gluon_rpm
  
@@@ -56,6 -46,9 +46,6 @@@ pushd netready/ > /dev/nul
  git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz
  popd > /dev/null
  
 -# Download quagga/zrpc rpms
 -populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz
 -
  # Download ODL netvirt for VPP
  populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm
  
@@@ -66,7 -59,9 +56,7 @@@
  # upload neutron patch for generic NS linux interface driver + OVS for external networks
  LIBGUESTFS_BACKEND=direct virt-customize \
      --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
 -    --run-command "curl -L https://nexus.fd.io/content/repositories/fd.io.stable.1704.centos7/io/fd/hc2vpp/honeycomb/1.17.04-2048.noarch/honeycomb-1.17.04-2048.noarch.rpm > /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
      --install opendaylight,python-networking-odl \
 -    --run-command "yum install -y /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
      --upload ${BUILD_DIR}/puppet-opendaylight-boron.tar.gz:/etc/puppet/modules/ \
      --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-boron.tar.gz" \
      --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/root/ \
@@@ -76,30 -71,16 +66,30 @@@
      --install python-click \
      --upload ${CACHE_DIR}/$gluon_rpm:/root/\
      --install /root/$gluon_rpm \
 -    --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \
 -    --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \
      --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 ${CACHE_DIR}/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm:/root/ \
      -a overcloud-full-opendaylight_build.qcow2
  
 +# Arch dependent on x86
 +if [ "$(uname -i)" == 'x86_64' ]; then
 +
 +# Download quagga/zrpc rpms
 +populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz
 +# Download Honeycomb
 +populate_cache https://nexus.fd.io/content/repositories/fd.io.stable.1704.centos7/io/fd/hc2vpp/honeycomb/1.17.04-2048.noarch/honeycomb-1.17.04-2048.noarch.rpm
 +
 +LIBGUESTFS_BACKEND=direct virt-customize \
 +    --upload ${CACHE_DIR}/honeycomb-1.17.04-2048.noarch.rpm:/root/fdio/ \
 +    --run-command "yum install -y /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
 +    --install zeromq-4.1.4 \
 +    --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \
 +    --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \
 +    --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
 +    --run-command "sudo usermod -a -G quaggavt quagga" \
 +    -a overcloud-full-opendaylight_build.qcow2
 +fi
 +
  LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
  popd > /dev/null