Clark Boylan 2beb4b2ef2 Fix elasticsearch mapping path and content.
* modules/logstash/manifests/elasticsearch.pp: The file name for the
default elasticsearch mapping is default-mapping.json not
default_mapping.json. Fix this path.

* modules/logstash/files/elasticsearch.mapping.json: Add a missing
comma.

Change-Id: I36bbe6e125157b97f3333f383a8949b2a6b3ef5c
Reviewed-on: https://review.openstack.org/28484
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
2013-05-08 18:39:34 +00:00

80 lines
2.3 KiB
Puppet

# Copyright 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# Class to install elasticsearch.
#
class logstash::elasticsearch {
# install java runtime
package { 'java7-runtime-headless':
ensure => present,
}
exec { 'get_elasticsearch_deb':
command => 'wget http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.20.2.deb -O /tmp/elasticsearch-0.20.2.deb',
path => '/bin:/usr/bin',
creates => '/tmp/elasticsearch-0.20.2.deb',
}
# install elastic search
package { 'elasticsearch':
ensure => present,
source => '/tmp/elasticsearch-0.20.2.deb',
provider => 'dpkg',
require => [
Package['java7-runtime-headless'],
Exec['get_elasticsearch_deb'],
]
}
file { '/etc/elasticsearch/elasticsearch.yml':
ensure => present,
source => 'puppet:///modules/logstash/elasticsearch.yml',
replace => true,
owner => 'root',
group => 'root',
mode => '0644',
require => Package['elasticsearch'],
}
file { '/etc/elasticsearch/default-mapping.json':
ensure => present,
source => 'puppet:///modules/logstash/elasticsearch.mapping.json',
replace => true,
owner => 'root',
group => 'root',
mode => '0644',
require => Package['elasticsearch'],
}
file { '/etc/default/elasticsearch':
ensure => present,
source => 'puppet:///modules/logstash/elasticsearch.default',
replace => true,
owner => 'root',
group => 'root',
mode => '0644',
require => Package['elasticsearch'],
}
service { 'elasticsearch':
ensure => running,
require => Package['elasticsearch'],
subscribe => [
File['/etc/elasticsearch/elasticsearch.yml'],
File['/etc/elasticsearch/default-mapping.json'],
File['/etc/default/elasticsearch'],
],
}
}