Code Review / apex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 4c81410 0220094)
Merge "Increase memory size for virt-customize"
authorTim Rozet <trozet@redhat.com>
Thu, 5 Oct 2017 19:13:23 +0000 (19:13 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 5 Oct 2017 19:13:23 +0000 (19:13 +0000)
1  2 
build/barometer-install.sh patch | diff1 | diff2 | blob | history
build/overcloud-full.sh patch | diff1 | diff2 | blob | history

diff --cc build/barometer-install.sh
index bde7479,0e7dd96..15753a4
--- 1/build/barometer-install.sh
--- 2/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
diff --cc build/overcloud-full.sh
Simple merge