opendev
/
puppet-elasticsearch
Code Issues Proposed changes

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
This commit is contained in:
Jeremy Stanley 2014-02-25 22:03:54 +00:00
parent 1f44661218
commit 9e4587d6c5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@ -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'],
],
}
}