From: Tim Rozet <trozet@redhat.com>
Date: Wed, 4 Oct 2017 18:06:35 +0000 (+0000)
Subject: Merge "Pass flags to allow domain undefine with NVRAM"
X-Git-Tag: opnfv-6.0.0~77
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=01e35f7f336f5a95e85131671abe82a7f99946aa;hp=30c7c9e4de1bbd4d4cdc6f0c775d52f80a3103fb;p=apex.git

Merge "Pass flags to allow domain undefine with NVRAM"
---

diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index 9e5dfc73..bde7479e 100755
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -19,7 +19,7 @@
 # puppet-barometer module.
 
 # Versions/branches
-COLLECTD_OPENSTACK_PLUGINS_BRANCH="stable/ocata"
+COLLECTD_OPENSTACK_PLUGINS_BRANCH="stable/pike"
 
 ARCH="6.el7.centos.x86_64.rpm"
 # don't fail because of missing certificate
@@ -80,7 +80,7 @@ function barometer_pkgs {
   rm -rf collectd-openstack-plugins
   git clone $COLLECTD_OPENSTACK_REPO collectd-openstack-plugins
   pushd collectd-openstack-plugins
-  git checkout -b $COLLECTD_OPENSTACK_PLUGINS_BRANCH
+  git checkout $COLLECTD_OPENSTACK_PLUGINS_BRANCH
   git archive --format=tar.gz HEAD > ${BUILD_DIR}/collectd-openstack-plugins.tar.gz
   popd > /dev/null
 
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" \