Skip to content
This repository has been archived by the owner on Oct 16, 2024. It is now read-only.

Remove CORS & Fix typos (E.S.) #2878

Merged
merged 1 commit into from
Jul 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions hieradata/roles/platform_elasticsearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion modules/dc_elasticsearch/manifests/template_install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down