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?a=commitdiff_plain;h=f941e233e575821695dc876c9a7a9f6c31e6dd00;hp=-c;p=apex.git

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

f941e233e575821695dc876c9a7a9f6c31e6dd00
diff --combined 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
@@@ -80,7 -81,7 +81,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
  
@@@ -101,7 -102,7 +102,7 @@@
    # 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 +112,12 @@@
      --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 +137,7 @@@
    # 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 && \
diff --combined build/overcloud-full.sh
index dea70f54,09137d7b..ac412d90
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -48,7 -48,7 +48,7 @@@ qemu-img resize overcloud-full_build.qc
  # installing forked apex-puppet-tripleo
  # upload neutron port data plane status
  # REMOVE Tacker VNFFG patch when moving to Pike
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
      --run-command "xfs_growfs /dev/sda" \
      --upload ${BUILD_DIR}/apex-puppet-tripleo.tar.gz:/etc/puppet/modules \
      --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf apex-puppet-tripleo.tar.gz" \
@@@ -82,7 -82,7 +82,7 @@@
  # apply congress parallel execution patch
  # Requirements from Doctor project
  # TODO(cgoncalves): code merged in Pike dev cycle. drop from >= OpenStack Pike / > OPNFV Euphrates
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
      --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_lib_dps.patch " \
      --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_server_dps.patch" \
      --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_openstacksdk_dps.patch" \
@@@ -141,7 -141,7 +141,7 @@@ populate_cache $kvmfornfv_uri_base/$kvm
  # upload puppet fdio
  # git clone vsperf into the overcloud image
  # upload the rt_kvm kernel
- LIBGUESTFS_BACKEND=direct virt-customize \
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
      --run-command "mkdir /root/dpdk_rpms" \
      $dpdk_pkg_str \
      --upload ${BUILD_DIR}/puppet-fdio.tar.gz:/etc/puppet/modules \
@@@ -152,7 -152,8 +152,7 @@@
      --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" \