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

Use stable/8.0 branch for fuel-library modules 

There are many changes between 7.0 and stable/8.0 and it is safer to
base our work on stable/8.0. Eventually we'll switch to the 8.0 tag once
it is available.

The OpenStack Puppet modules are pulled from upstream since
fuel-library has switched to upstream too.

Change-Id: Ie6fcedc738d45061d52e32567cf6cfed8ffa2e51
This commit is contained in:
Simon Pasquier 2016-01-06 10:02:50 +01:00
parent 1fa85b3f6c
commit ba1d1ad8af
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pre_build_hook
View File

@ -3,7 +3,8 @@ set -eux
. "$(dirname "$(readlink -f "$0")")"/functions.sh
HEKA_VERSION="0.10.0"
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"
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"
@ -11,6 +12,13 @@ STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4
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"
CINDER_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-cinder-7.0.0.tar.gz"
GLANCE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-glance-7.0.0.tar.gz"
HEAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-heat-7.0.0.tar.gz"
KEYSTONE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-keystone-7.0.0.tar.gz"
NEUTRON_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-neutron-7.0.0.tar.gz"
NOVA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-nova-7.0.0.tar.gz"
OPENSTACKLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-openstacklib-7.0.0.tar.gz"
download_packages \
https://github.com/mozilla-services/heka/releases/download/v${HEKA_VERSION}/heka_${HEKA_VERSION}_amd64.deb \
@ -39,10 +47,12 @@ download_packages \
http://mirrors.kernel.org/ubuntu/pool/main/libd/libdbi-drivers/libdbd-mysql_0.9.0-2ubuntu2_amd64.deb
# Extract dependent manifests from fuel-library
rm -rf "${MODULES_DIR:?}"/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker,l23network}
rm -rf "${MODULES_DIR:?}"/{haproxy,openstack,osnailyfacter,pacemaker,l23network}
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,keystone,neutron,nova,openstack,osnailyfacter,pacemaker,l23network}
fuel-library-${FUEL_LIB_COMMIT/\//-}/deployment/puppet/{haproxy,openstack,osnailyfacter,pacemaker,l23network}
# Remove this dead link otherwise fpb fails
rm -f "${MODULES_DIR:?}"/osnailyfacter/modular/master
download_puppet_module "collectd" "${COLLECTD_TARBALL_URL}"
download_puppet_module "apache" "${APACHE_TARBALL_URL}"
@ -50,3 +60,10 @@ 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}"
download_puppet_module "cinder" "${CINDER_TARBALL_URL}"
download_puppet_module "glance" "${GLANCE_TARBALL_URL}"
download_puppet_module "heat" "${HEAT_TARBALL_URL}"
download_puppet_module "keystone" "${KEYSTONE_TARBALL_URL}"
download_puppet_module "neutron" "${NEUTRON_TARBALL_URL}"
download_puppet_module "nova" "${NOVA_TARBALL_URL}"
download_puppet_module "openstacklib" "${OPENSTACKLIB_TARBALL_URL}"