x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Use upstream concat Puppet module v1.2.4 

Previously, we ship from fuel-library concat v1.1.0 with a bug fix
from v1.1.1 (cherry-picked).
Version 1.2.4 comes with many bug fixes.

Change-Id: Iecbf625d527df8b610e28be0ca34fabe5c1188a3
This commit is contained in:
Swann Croiset 2015-07-24 09:29:49 +02:00
parent 432824ab0f
commit 76295c8e34
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pre_build_hook
View File

@ -12,6 +12,7 @@ FUEL_LIB_TARBALL_URL="https://github.com/stackforge/fuel-library/archive/${FUEL_
COLLECTD_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/pdxcat-collectd-3.2.0.tar.gz"
APACHE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-apache-1.4.0.tar.gz"
STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.7.0.tar.gz"
CONCAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-concat-1.2.4.tar.gz"
function download_packages {
while [ $# -gt 0 ]; do
@ -64,10 +65,10 @@ download_packages \
# Extract dependent manifests from fuel-library
rm -rf "${MODULES_DIR:?}"/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack,concat}
rm -rf "${MODULES_DIR:?}"/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack}
wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack,concat}
fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack}
rm -rf "${MODULES_DIR:?}"/collectd
mkdir -p "${MODULES_DIR}"/collectd
@ -80,3 +81,7 @@ wget -qO- "${APACHE_TARBALL_URL}" | tar -C "${MODULES_DIR}/apache" --strip-compo
rm -rf "${MODULES_DIR:?}"/stdlib
mkdir -p "${MODULES_DIR}"/stdlib
wget -qO- "${STDLIB_TARBALL_URL}" | tar -C "${MODULES_DIR}/stdlib" --strip-components=1 -xz
rm -rf "${MODULES_DIR:?}"/concat
mkdir -p "${MODULES_DIR}"/concat
wget -qO- "${CONCAT_TARBALL_URL}" | tar -C "${MODULES_DIR}/concat" --strip-components=1 -xz