From a518ec684a0483eb08bf8abbb22fe46c4369d4c4 Mon Sep 17 00:00:00 2001 From: Joel Merrick Date: Tue, 26 Jul 2016 16:13:08 +0100 Subject: [PATCH] Fixes for a couple of typos * Fixes unicast host -> hosts typo * Fixes the template load path (presumably always broken, but applied manually 1st time) * Removed CORS --- hieradata/roles/platform_elasticsearch.yaml | 4 +--- modules/dc_elasticsearch/manifests/template_install.pp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hieradata/roles/platform_elasticsearch.yaml b/hieradata/roles/platform_elasticsearch.yaml index a713c647d..cc20c6e64 100644 --- a/hieradata/roles/platform_elasticsearch.yaml +++ b/hieradata/roles/platform_elasticsearch.yaml @@ -10,12 +10,10 @@ dc_elasticsearch::es_hash: cluster.name: 'logstash_platform_services' discovery.zen.minimum_master_nodes: '2' discovery.zen.ping.multicast.enabled: false - discovery.zen.ping.unicast.host: + discovery.zen.ping.unicast.hosts: - 'elasticsearch0.core.sal01.datacentred.co.uk' - 'elasticsearch1.core.sal01.datacentred.co.uk' - 'elasticsearch2.core.sal01.datacentred.co.uk' - http.cors.allow-origin: '"*"' - http.cors.enabled: 'true' index.translog.flush_threshold_ops: '50000' indices.memory.index_buffer_size: '50%' network.host: diff --git a/modules/dc_elasticsearch/manifests/template_install.pp b/modules/dc_elasticsearch/manifests/template_install.pp index 01357f797..0d1a71c99 100644 --- a/modules/dc_elasticsearch/manifests/template_install.pp +++ b/modules/dc_elasticsearch/manifests/template_install.pp @@ -13,7 +13,7 @@ } exec { 'install_logstash_template': - command => 'curl -XPUT \'http://localhost:9200/_template/logstash\' -d@/usr/local/etc/logstash.template', + command => 'curl -XPUT \'http://localhost:9200/_template/logstash\' -d@/usr/local/etc/elasticsearch_logstash_template', subscribe => File['logstash_template'], require => Package['curl'], refreshonly => true,