From: Dan Radez <dradez@redhat.com>
Date: Thu, 5 Oct 2017 13:24:52 +0000 (+0000)
Subject: Merge "This config is no longer needed"
X-Git-Tag: opnfv-6.0.0~76
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4c8141069f9adf7d315bc53c236d8e7928030def;hp=811bb2c4878973fd3c479d880bb6aea9b1c2958c;p=apex.git

Merge "This config is no longer needed"
---

diff --git a/apex/clean.py b/apex/clean.py
index 0b1be860..f56287e1 100644
--- a/apex/clean.py
+++ b/apex/clean.py
@@ -70,7 +70,7 @@ def clean_vms():
         if domain.isActive():
             logging.debug('Destroying domain')
             domain.destroy()
-        domain.undefine()
+        domain.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_NVRAM)
         # delete storage volume
         try:
             stgvol = pool.storageVolLookupByName("{}.qcow2".format(vm))
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