From: Tim Rozet <trozet@redhat.com>
Date: Wed, 4 Oct 2017 15:36:34 +0000 (+0000)
Subject: Merge "baro: update collectd-openstack branch"
X-Git-Tag: opnfv-6.0.0~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=992e5d6084ddea8d3bb65a92bd98b8789be3c703;hp=162408b69d15e62b7800e4711f81cf2638b10823;p=apex.git

Merge "baro: update collectd-openstack branch"
---

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 06adbbe6..dea70f54 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -152,8 +152,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_DIR}/kubernetes.repo:/etc/yum.repos.d/ \
     --run-command "mkdir /root/fdio" \
     --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/nosdn_vpp_rpms \
-    --install honeycomb \
-    --install vpp-plugins,vpp,vpp-lib,vpp-api-python \
+    --install honeycomb,vpp-plugins,vpp,vpp-lib,vpp-api-python \
     --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
     --run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \
     --run-command "mkdir /root/ovs28" \