Leverage the local fuel-library modules
This change drops the download of the fuel-library Puppet modules into
the plugin package. Instead the Puppet tasks look for Puppet modules
first in the plugin's path and alternatively in the default
/etc/puppet/module path.
This is required to have the same release of LMA supporting multiple MOS
versions more easily.
Change-Id: I7303a161d3826ed26430733339869f0a02e9ca00
(cherry picked from commit 8d5622bf70)
This commit is contained in:
Simon Pasquier
parent
6b418fc63e
commit
a75dfacc28
|
|
@ -3,9 +3,6 @@ set -eux
|
|||
|
||||
. "$(dirname "$(readlink -f "$0")")"/functions.sh
|
||||
HEKA_VERSION="0.10.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"
|
||||
STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.7.0.tar.gz"
|
||||
|
|
@ -47,14 +44,6 @@ download_packages \
|
|||
http://mirrors.kernel.org/ubuntu/pool/universe/c/collectd/collectd_5.4.0-3ubuntu2_amd64.deb \
|
||||
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:?}"/{haproxy,openstack,osnailyfacter,pacemaker,pacemaker_wrappers,l23network}
|
||||
wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
|
||||
tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
|
||||
fuel-library-${FUEL_LIB_COMMIT/\//-}/deployment/puppet/{haproxy,openstack,osnailyfacter,pacemaker,pacemaker_wrappers,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}"
|
||||
download_puppet_module "stdlib" "${STDLIB_TARBALL_URL}"
|
||||
|
|
|
|||
24
tasks.yaml
24
tasks.yaml
|
|
@ -4,7 +4,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/check_environment_configuration.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 300
|
||||
|
||||
# The Hiera data needs to be populated first so that other plugins (eg LMA
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/hiera_override.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
# The following tasks are executed in the order they are declared
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/configure_apt.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: '*'
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/base.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: '*'
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/aggregator.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: ['controller', 'primary-controller']
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/controller.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: [ 'compute' ]
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/compute.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: ['cinder']
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/cinder.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: ['ceph-osd']
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/ceph_osd.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: '*'
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/configure_afd_filters.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role:
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/lma_backends.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
- role: '*'
|
||||
|
|
@ -103,6 +103,6 @@
|
|||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/cleanup_apt_config.pp
|
||||
puppet_modules: puppet/modules
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 600
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue