opendev/system-config
Code Issues Proposed changes

Merge "Correct elasticsearch config dependency ordering"

Browse Source
This commit is contained in:
Jenkins 2014-02-25 23:51:56 +00:00 committed by Gerrit Code Review
commit b96b5bff2d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/elasticsearch/manifests/init.pp
View File

@ -64,6 +64,9 @@ class elasticsearch (
require => [ require => [
Package['java7-runtime-headless'], Package['java7-runtime-headless'],
Exec['check_elasticsearch_sha1'], 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', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
require => Package['elasticsearch'],
} }
file { '/etc/elasticsearch/templates': file { '/etc/elasticsearch/templates':
@ -82,7 +84,6 @@ class elasticsearch (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
require => Package['elasticsearch'],
} }
file { '/etc/elasticsearch/default-mapping.json': file { '/etc/elasticsearch/default-mapping.json':
@ -92,7 +93,6 @@ class elasticsearch (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
require => Package['elasticsearch'],
} }
file { '/etc/default/elasticsearch': file { '/etc/default/elasticsearch':
@ -102,16 +102,12 @@ class elasticsearch (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
require => Package['elasticsearch'],
} }
service { 'elasticsearch': service { 'elasticsearch':
ensure => running, ensure => running,
require => [ require => [
Package['elasticsearch'], Package['elasticsearch'],
File['/etc/elasticsearch/elasticsearch.yml'],
File['/etc/elasticsearch/default-mapping.json'],
File['/etc/default/elasticsearch'],
], ],
} }
} }