diff options
Diffstat (limited to 'build/barometer-install.sh')
| -rwxr-xr-x | build/barometer-install.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/barometer-install.sh b/build/barometer-install.sh index 9e5dfc73..15753a44 100755 --- a/build/barometer-install.sh +++ b/build/barometer-install.sh @@ -17,9 +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 @@ 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 @@ 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 && \ |