Merge "Fixes nova instance pinning defaults" into stable/colorado

[apex.git] / build / overcloud-opendaylight.sh

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 65f9c06..af65910 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -46,6 +46,8 @@ 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
 
+# Honeycomb RPM
+wget $fdio_uri_base/$honeycomb_pkg
 
 # install ODL packages
 # install Jolokia for ODL HA
@@ -60,8 +62,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --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" \
-    --upload ../honeycomb-1.0.0-99.noarch.rpm:/root/ \
-    --run-command "yum -y install /root/honeycomb-1.0.0-99.noarch.rpm" \
+    --upload $honeycomb_pkg:/root/ \
+    --run-command "yum -y install /root/$honeycomb_pkg" \
     --upload ./setup_TEPs.py:/tmp \
     -a overcloud-full-opendaylight_build.qcow2