From fa12b0f158b591b9faad6a0da94bfc45c7298f38 Mon Sep 17 00:00:00 2001
From: Swann Croiset <scroiset@mirantis.com>
Date: Wed, 13 Jan 2016 19:09:19 +0100
Subject: [PATCH] Upgrade Elasticsearch Puppet module to 0.10.1

see https://github.com/elastic/puppet-elasticsearch/blob/master/CHANGELOG.md

Change-Id: I79e5d2b1d2bac151e6bb97262ea779ebfedf678d
---
 .../puppet/modules/lma_logging_analytics/metadata.json       | 2 +-
 pre_build_hook                                               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/deployment_scripts/puppet/modules/lma_logging_analytics/metadata.json b/deployment_scripts/puppet/modules/lma_logging_analytics/metadata.json
index d3fcfe3..cb01570 100644
--- a/deployment_scripts/puppet/modules/lma_logging_analytics/metadata.json
+++ b/deployment_scripts/puppet/modules/lma_logging_analytics/metadata.json
@@ -21,6 +21,6 @@
     "dependencies": [
         {"name": "puppetlabs/stdlib", "version_requirement": "4.x"},
         {"name": "jfryman/nginx", "version_requirement": ">= 0.2.2"},
-        {"name": "elasticsearch/elasticsearch", "version_requirement": ">= 0.9.0"}
+        {"name": "elasticsearch/elasticsearch", "version_requirement": ">= 0.10.x"}
     ]
 }
diff --git a/pre_build_hook b/pre_build_hook
index 9a621d9..2d70401 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -7,7 +7,9 @@ set -eux
 CONCAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-concat-1.2.4.tar.gz"
 STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.7.0.tar.gz"
 NGINX_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/jfryman-nginx-0.2.2.tar.gz"
-ELASTICSEARCH_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/elasticsearch-elasticsearch-0.9.1.tar.gz"
+ELASTICSEARCH_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/elasticsearch-elasticsearch-0.10.1.tar.gz"
+# 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"
@@ -38,6 +40,7 @@ download_puppet_module "stdlib" "$STDLIB_TARBALL_URL"
 download_puppet_module "nginx" "$NGINX_TARBALL_URL"
 download_puppet_module "elasticsearch" "$ELASTICSEARCH_TARBALL_URL"
 download_puppet_module "firewall" "$FIREWALL_TARBALL_URL"
+download_puppet_module "datacat" "$DATACAT_TARBALL_URL"
 
 # Untar kibana
 KIBANA_FOLDER="${MODULES_DIR}/lma_logging_analytics/files/kibana/src"