diff --git a/pre_build_hook b/pre_build_hook index f75767e98..4d909b789 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -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