Merge "Use stable/8.0 branch for fuel-library modules"

This commit is contained in:
Jenkins 2016-01-15 10:05:39 +00:00 committed by Gerrit Code Review
commit 1d2997342f
1 changed files with 5 additions and 2 deletions

View File

@ -9,7 +9,8 @@ STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4
INIFILE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-inifile-1.4.1.tar.gz"
LVM_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-lvm-0.5.0.tar.gz"
GRAFANA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/bfraser-grafana-2.1.0.tar.gz"
FUEL_LIB_COMMIT="7.0"
# TODO(pasquier-s): use the 8.0 tag when it's available
FUEL_LIB_COMMIT="stable/8.0"
FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz"
download_package https://s3.amazonaws.com/influxdb/influxdb_0.9.6.1_amd64.deb
@ -28,4 +29,6 @@ download_puppet_module "lvm" "$LVM_TARBALL_URL"
rm -rf "${MODULES_DIR:?}"/l23network
wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/l23network
fuel-library-${FUEL_LIB_COMMIT/\//-}/deployment/puppet/l23network
# Remove this dead link otherwise fpb fails
rm -f "${MODULES_DIR:?}"/osnailyfacter/modular/master