Merge branch 'master' of github.com:jakommo/ansible-elasticsearch

Conflicts:
	README.md
This commit is contained in:
Jakob Reiter 2015-08-04 14:19:02 +02:00
commit 32da49cc1f

View file

@ -38,8 +38,8 @@ hosts: my_host
roles: roles:
- elasticsearch - elasticsearch
vars: vars:
java_packages: java_debian:
- "oracle-java7-installer" - "openjdk-7-jre-headless"
es_major_version: 1.7 es_major_version: 1.7
es_version: 1.7.0 es_version: 1.7.0
es_start_service: false es_start_service: false
@ -84,7 +84,7 @@ Which minor version to use.
```es_start_service``` (true (default) or false) ```es_start_service``` (true (default) or false)
Should elasticsearch be startet after installation? Should elasticsearch be started after installation?
```es_use_repository``` (true (default) or false ) ```es_use_repository``` (true (default) or false )
@ -111,10 +111,10 @@ Schould plugins be reinstalled?
version: 2.5.0 version: 2.5.0
``` ```
```java_debian``` `java_debian`
name of the java debian package to use (e.g. `openjdk-7-jre-headless`) name of the java debian package to use (e.g. `openjdk-7-jre-headless`)
```java_rhel``` `java_rhel`
name of the java rhel package to use (e.g. `java-1.8.0-openjdk.x86_64`) name of the java rhel package to use (e.g. `java-1.8.0-openjdk.x86_64`)