From: Tim Rozet <trozet@redhat.com>
Date: Thu, 5 Oct 2017 19:13:23 +0000 (+0000)
Subject: Merge "Increase memory size for virt-customize"
X-Git-Tag: opnfv-6.0.0~75
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=apex.git;a=commitdiff_plain;h=f941e233e575821695dc876c9a7a9f6c31e6dd00

Merge "Increase memory size for virt-customize"
---

f941e233e575821695dc876c9a7a9f6c31e6dd00
diff --cc build/barometer-install.sh
index bde7479e,0e7dd966..15753a44
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@@ -17,9 -17,10 +17,10 @@@
  # Get and install packages needed for Barometer service.
  # These are: collectd rpm's and dependencies, collectd-openstack-plugins,
  # puppet-barometer module.
+ source ./variables.sh
  
  # 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