From 46c3c63def606e6d2ffc60ed67af40bdb6a22f27 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 25 Feb 2014 22:03:54 +0000
Subject: [PATCH] Correct elasticsearch config dependency ordering

* modules/elasticsearch/manifests/init.pp: The config files need to
be in place before package installation starts the service, and they
don't depend on the package itself anyway.

Change-Id: Iabc57e3091533eb5168c670f5c29d0d2dac9a1a2
---
 modules/elasticsearch/manifests/init.pp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/elasticsearch/manifests/init.pp b/modules/elasticsearch/manifests/init.pp
index 61c769d281..04c88b4f76 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -64,6 +64,9 @@ class elasticsearch (
     require   => [
       Package['java7-runtime-headless'],
       Exec['check_elasticsearch_sha1'],
+      File['/etc/elasticsearch/elasticsearch.yml'],
+      File['/etc/elasticsearch/default-mapping.json'],
+      File['/etc/default/elasticsearch'],
     ]
   }
 
@@ -74,7 +77,6 @@ class elasticsearch (
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package['elasticsearch'],
   }
 
   file { '/etc/elasticsearch/templates':
@@ -82,7 +84,6 @@ class elasticsearch (
     owner   => 'root',
     group   => 'root',
     mode    => '0755',
-    require => Package['elasticsearch'],
   }
 
   file { '/etc/elasticsearch/default-mapping.json':
@@ -92,7 +93,6 @@ class elasticsearch (
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package['elasticsearch'],
   }
 
   file { '/etc/default/elasticsearch':
@@ -102,16 +102,12 @@ class elasticsearch (
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    require => Package['elasticsearch'],
   }
 
   service { 'elasticsearch':
     ensure    => running,
     require   => [
       Package['elasticsearch'],
-      File['/etc/elasticsearch/elasticsearch.yml'],
-      File['/etc/elasticsearch/default-mapping.json'],
-      File['/etc/default/elasticsearch'],
     ],
   }
 }