openstack/kolla-ansible
Code Issues Proposed changes

Merge "[elasticsearch] Change ES_HEAP_SIZE to ES_JAVA_OPTS."

Browse Source
This commit is contained in:
Zuul 2018-05-27 20:30:43 +00:00 committed by Gerrit Code Review
commit b4de44b8be
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/elasticsearch/defaults/main.yml
View File

@ -6,7 +6,7 @@ elasticsearch_services:
enabled: true enabled: true
image: "{{ elasticsearch_image_full }}" image: "{{ elasticsearch_image_full }}"
environment: environment:
ES_HEAP_SIZE: "{{ es_heap_size }}" ES_JAVA_OPTS: "{{ es_java_opts }}"
volumes: volumes:
- "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/" - "{{ node_config_directory }}/elasticsearch/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
@ -18,6 +18,7 @@ elasticsearch_services:
#################### ####################
elasticsearch_cluster_name: "kolla_logging" elasticsearch_cluster_name: "kolla_logging"
es_heap_size: "1g" es_heap_size: "1g"
es_java_opts: "{% if es_heap_size %}-Xms{{ es_heap_size }} -Xmx{{ es_heap_size }}{%endif%}"
#################### ####################
# Docker # Docker