opendev/system-config
Code Issues Proposed changes

Merge "Silence successful elasticsearch runs"

Browse Source
This commit is contained in:
Jenkins 2014-04-18 22:50:38 +00:00 committed by Gerrit Code Review
commit 3241ba6e24
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ class elasticsearch (
$es_template_config = {} $es_template_config = {}
) { ) {
# install java runtime # install java runtime
package { 'java7-runtime-headless': package { 'openjdk-7-jre-headless':
ensure => present, ensure => present,
} }
@ -55,6 +55,8 @@ class elasticsearch (
exec { 'check_elasticsearch_sha1': exec { 'check_elasticsearch_sha1':
command => "diff /tmp/elasticsearch-${version}.deb.sha1.txt /tmp/elasticsearch-${version}.deb.sha1.gen", command => "diff /tmp/elasticsearch-${version}.deb.sha1.txt /tmp/elasticsearch-${version}.deb.sha1.gen",
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
subscribe => Exec['get_elasticsearch_deb'],
refreshonly => true,
require => [ require => [
Exec['gen_elasticsearch_deb_sha1'], Exec['gen_elasticsearch_deb_sha1'],
Exec['get_elasticsearch_deb_sha1'], Exec['get_elasticsearch_deb_sha1'],
@ -66,10 +68,9 @@ class elasticsearch (
ensure => latest, ensure => latest,
source => "/tmp/elasticsearch-${version}.deb", source => "/tmp/elasticsearch-${version}.deb",
provider => 'dpkg', provider => 'dpkg',
subscribe => Exec['get_elasticsearch_deb'], subscribe => Exec['get_elasticsearch_sha1'],
require => [ require => [
Package['java7-runtime-headless'], Package['java7-runtime-headless'],
Exec['check_elasticsearch_sha1'],
File['/etc/elasticsearch/elasticsearch.yml'], File['/etc/elasticsearch/elasticsearch.yml'],
File['/etc/elasticsearch/default-mapping.json'], File['/etc/elasticsearch/default-mapping.json'],
File['/etc/default/elasticsearch'], File['/etc/default/elasticsearch'],