summaryrefslogtreecommitdiffstats
path: root/build/barometer-install.sh
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2017-09-29 16:02:50 +1000
committerMichael Chapman <michapma@redhat.com>2017-10-05 22:16:03 +1100
commit0220094bfe4abdc964f282f4f01190897e3065e4 (patch)
tree089e01cf65a6260adf93f1792d6818447d382896 /build/barometer-install.sh
parent864527cb7a61eda541aa812fe985843989595e9a (diff)
Increase memory size for virt-customize
Some of the bigger commands can exceed the default, so increase all instances for consistency. It's unlikely build machines won't have 4G of memory available. Change-Id: Ifa575b6e6faef9ba038900ab0e080da15d5680aa JIRA: APEX-520 Signed-off-by: Michael Chapman <michapma@redhat.com>
Diffstat (limited to 'build/barometer-install.sh')
-rwxr-xr-xbuild/barometer-install.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index 9e5dfc73..0e7dd966 100755
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -17,6 +17,7 @@
# 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"
@@ -101,7 +102,7 @@ function barometer_pkgs {
# Upload tar files to image
# untar collectd packages
# install dependencies
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--upload ${BUILD_DIR}/collectd.tar.gz:/opt/ \
--upload ${BUILD_DIR}/collectd-openstack-plugins.tar.gz:/opt/ \
--upload ${BUILD_DIR}/puppet-barometer.tar.gz:/etc/puppet/modules/ \
@@ -111,12 +112,12 @@ function barometer_pkgs {
--install libvirt,libvirt-devel,gcc \
-a $OVERCLOUD_IMAGE
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--run-command 'python3.4 /opt/get-pip.py' \
--run-command 'pip3 install requests libvirt-python pbr babel future six' \
-a $OVERCLOUD_IMAGE
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--run-command "yum install -y \
/opt/libcollectdclient-${SUFFIX} \
/opt/libcollectdclient-devel-${SUFFIX} \
@@ -136,7 +137,7 @@ function barometer_pkgs {
# install collectd-openstack-plugins
# install puppet-barometer module
# make directories for config files and mibs
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--run-command 'mkdir /opt/stack/collectd-openstack' \
--run-command "tar xfz /opt/collectd-openstack-plugins.tar.gz -C /opt/stack/collectd-openstack" \
--run-command "cd /etc/puppet/modules/ && mkdir barometer && \