From 432824ab0f168cee9ec1fe66a81f44e26a267b83 Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Fri, 24 Jul 2015 09:12:44 +0200 Subject: [PATCH] Use upstream stdlib Puppet module v4.7.0 Previously, we shipped stdlib v4.2.1 from the fuel-library but we can easily switch to the latest version since there is not compatibility break, many fug fixes and fuel-library doesn't diverged (except few changes). Change-Id: I4913dd30b6fa809588ca2e1833fdcc689c48cbb9 --- pre_build_hook | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pre_build_hook b/pre_build_hook index 0c0fba5e7..f75767e98 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -11,6 +11,7 @@ FUEL_LIB_COMMIT="be44e9ea792fe4314ac8c1b7596742ceb5163f61" FUEL_LIB_TARBALL_URL="https://github.com/stackforge/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz" 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" function download_packages { while [ $# -gt 0 ]; do @@ -63,10 +64,10 @@ download_packages \ # Extract dependent manifests from fuel-library -rm -rf "${MODULES_DIR:?}"/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack,stdlib,concat} +rm -rf "${MODULES_DIR:?}"/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack,concat} 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,stdlib,concat} + fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,heat,inifile,keystone,neutron,nova,openstack,concat} rm -rf "${MODULES_DIR:?}"/collectd mkdir -p "${MODULES_DIR}"/collectd @@ -75,3 +76,7 @@ wget -qO- "${COLLECTD_TARBALL_URL}" | tar -C "${MODULES_DIR}/collectd" --strip-c rm -rf "${MODULES_DIR:?}"/apache mkdir -p "${MODULES_DIR}"/apache wget -qO- "${APACHE_TARBALL_URL}" | tar -C "${MODULES_DIR}/apache" --strip-components=1 -xz + +rm -rf "${MODULES_DIR:?}"/stdlib +mkdir -p "${MODULES_DIR}"/stdlib +wget -qO- "${STDLIB_TARBALL_URL}" | tar -C "${MODULES_DIR}/stdlib" --strip-components=1 -xz