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: Icf49b48462956fbb57c087e133336738cda70d68

deployment_tasks.yaml

@@ -35,7 +35,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: puppet/manifests/check_environment_configuration.pp
-    puppet_modules: puppet/modules
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
   reexecute_on:
     - deploy_changes
@@ -48,7 +48,7 @@
   requires: [netconfig]
   parameters:
     puppet_manifest: "puppet/manifests/firewall.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 3600
 
 - id: lma-es-cluster
@@ -58,7 +58,7 @@
   requires: [lma-es-firewall]
   parameters:
     puppet_manifest: "puppet/manifests/cluster.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 3600
   reexecute_on:
     - deploy_changes
@@ -70,7 +70,7 @@
   requires: [lma-es-cluster]
   parameters:
     puppet_manifest: "puppet/modules/osnailyfacter/modular/virtual_ips/virtual_ips.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 3600
 
 # This task needs to be reexecuted to adapt configuration variables depending
@@ -82,7 +82,7 @@
   required_for: [logging, lma-es-cluster, lma-es-kibana-haproxy]
   parameters:
     puppet_manifest: "puppet/manifests/hiera_override.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
   reexecute_on:
     - deploy_changes
@@ -95,7 +95,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: "puppet/manifests/haproxy.pp"
-    puppet_modules: "puppet/modules"
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 120
   reexecute_on:
     - deploy_changes
@@ -108,7 +108,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: puppet/manifests/elasticsearch.pp
-    puppet_modules: puppet/modules
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
   reexecute_on:
     - deploy_changes
@@ -120,7 +120,7 @@
   required_for: [deploy_end]
   parameters:
     puppet_manifest: puppet/manifests/kibana.pp
-    puppet_modules: puppet/modules
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
 
 # This task needs to be reexecuted to reconfigure index templates with an
@@ -133,7 +133,7 @@
   required_for: [lma-es-kibana-enable-quorum, post_deployment_end]
   parameters:
     puppet_manifest: puppet/manifests/provision_services.pp
-    puppet_modules: puppet/modules
+    puppet_modules: puppet/modules:/etc/puppet/modules
     timeout: 600
   reexecute_on:
     - deploy_changes
@@ -148,7 +148,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

@@ -11,8 +11,6 @@ ELASTICSEARCH_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/elasticsearc
 # Dependency for Elasticsearch 0.10.x
 DATACAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/richardc-datacat-0.6.2.tar.gz"
 FIREWALL_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-firewall-1.7.2.tar.gz"
-FUEL_LIB_COMMIT="stable/8.0"
-FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz"
 
 # Kibana 3 sources
 KIBANA_TARBALL_URL="https://download.elasticsearch.org/kibana/kibana/kibana-3.1.3.tar.gz"
@@ -46,12 +44,3 @@ download_puppet_module "datacat" "$DATACAT_TARBALL_URL"
 KIBANA_FOLDER="${MODULES_DIR}/lma_logging_analytics/files/kibana/src"
 mkdir -p "${KIBANA_FOLDER}"
 wget -qO- "${KIBANA_TARBALL_URL}" | tar -C "${KIBANA_FOLDER}" --strip-components=1 -xz
-
-# Extract dependent manifests from fuel-library
-rm -rf "${MODULES_DIR:?}"/{l23network,osnailyfacter,cluster,pacemaker_wrappers,pacemaker,openstack,haproxy,corosync}
-wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
-    tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
-    fuel-library-${FUEL_LIB_COMMIT/\//-}/deployment/puppet/{l23network,osnailyfacter,cluster,pacemaker_wrappers,pacemaker,openstack,haproxy,corosync}
-
-# Remove the dead link : osnailyfacter/modular/master -> ../nailgun/examples
-rm -rf ${MODULES_DIR}/osnailyfacter/modular/master