diff --git a/pre_build_hook b/pre_build_hook index f40265ec6..8fc77084f 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -3,13 +3,13 @@ set -eux . "$(dirname "$(readlink -f "$0")")"/functions.sh HEKA_VERSION="0.10.0b1" -# This is the commit id for the current stable/6.1 branch -FUEL_LIB_COMMIT="be44e9ea792fe4314ac8c1b7596742ceb5163f61" +FUEL_LIB_COMMIT="7.0" FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz" COLLECTD_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppet-collectd-4.1.2.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" +INIFILE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-inifile-1.4.2.tar.gz" FIREWALL_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-firewall-1.7.0.tar.gz" download_packages \ @@ -48,13 +48,14 @@ download_packages \ # Extract dependent manifests from fuel-library -rm -rf "${MODULES_DIR:?}"/{cinder,glance,haproxy,heat,inifile,keystone,neutron,nova,openstack,pacemaker} +rm -rf "${MODULES_DIR:?}"/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker} wget -qO- "${FUEL_LIB_TARBALL_URL}" | \ tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \ - fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,haproxy,heat,inifile,keystone,neutron,nova,openstack,pacemaker} + fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker} download_puppet_module "collectd" "${COLLECTD_TARBALL_URL}" download_puppet_module "apache" "${APACHE_TARBALL_URL}" download_puppet_module "stdlib" "${STDLIB_TARBALL_URL}" download_puppet_module "concat" "${CONCAT_TARBALL_URL}" +download_puppet_module "inifile" "${INIFILE_TARBALL_URL}" download_puppet_module "firewall" "${FIREWALL_TARBALL_URL}"