Fixes honeycomb

Changes include:
 - Moves honeycomb to the opendaylight builder
 - Adds honeycomb puppet mod
 - Configures rest ports correctly and brings up honeycomb

opnfv-tht-pr: 60

Change-Id: I630e9a63754ca6e41d1816a52db3b8272a9f7b6f
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 5814c5c..e7f1dd7 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -123,7 +123,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum install -y /root/vpp-bin/*.rpm" \
     --run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \
     --install unzip \
-    --run-command "yum -y install https://github.com/marosmars/files/raw/master/honeycomb-1.0.0-99.noarch.rpm" \
     --upload puppet-fdio.tar.gz:/etc/puppet/modules \
     --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
     --upload vsperf.tar.gz:/var/opt \

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 3e403bb..34a7be7 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -39,9 +39,18 @@ 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
 
+# 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 /tmp/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \
     --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \
@@ -50,6 +59,9 @@ 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" \
+    --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