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.

Change-Id: Idc7e59a47e5b50e070fbd79f3c0867695d7ea00d

deployment_tasks.yaml

@@ -33,7 +33,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/manifests/hiera.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
 
 - id: lma-alerting-firewall
@@ -43,7 +43,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/manifests/firewall.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
 
 - id: lma-alerting-cluster
@@ -53,7 +53,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/manifests/cluster.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
   reexecute_on:
     - deploy_changes
@@ -65,7 +65,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
 # This task needs to be reexecuted to reconfigure the no-quorum-policy every
@@ -77,7 +77,7 @@
   required_for: [post_deployment_end]
   parameters:
     puppet_manifest: "puppet/manifests/enable_quorum.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
   reexecute_on:
     - deploy_changes

pre_build_hook

@@ -3,8 +3,6 @@ set -eux
 
 . "$(dirname "$(readlink -f "$0")")"/functions.sh
 
-FUEL_LIB_COMMIT="stable/8.0"
-FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz"
 HTPASSWD_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/leinaddm-htpasswd-0.0.3.tar.gz"
 APACHE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-apache-1.4.0.tar.gz"
 CONCAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-concat-1.2.3.tar.gz"
@@ -42,13 +40,6 @@ download_packages \
     http://mirrors.kernel.org/ubuntu/pool/universe/h/heirloom-mailx/heirloom-mailx_12.5-4_amd64.deb
 
 
-rm -rf "${MODULES_DIR:?}"/{stdlib,htpasswd,apache,concat,l23network,osnailyfacter,cluster,corosync,pacemaker_wrappers,pacemaker,openstack}
-wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
-    tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
-    fuel-library-${FUEL_LIB_COMMIT/\//-}/deployment/puppet/{l23network,osnailyfacter,cluster,corosync,pacemaker_wrappers,pacemaker,openstack}
-# Remove this dead link otherwise fpb fails
-rm -f "${MODULES_DIR:?}"/osnailyfacter/modular/master
-
 download_puppet_module "htpasswd" "${HTPASSWD_TARBALL_URL}"
 download_puppet_module "apache" "${APACHE_TARBALL_URL}"
 download_puppet_module "concat" "${CONCAT_TARBALL_URL}"

tasks.yaml

@@ -6,7 +6,7 @@
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/nagios.pp
-    puppet_modules: puppet/modules
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
 - role: [primary-infrastructure_alerting]
@@ -14,5 +14,5 @@
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/nagios_dashboard_url.pp
-    puppet_modules: puppet/modules
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120