valitydev/salt-common
14
0
Fork 0
mirror of https://github.com/valitydev/salt-common.git synced 2024-11-06 10:25:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #180 from rbkmoney/add_es_java_opts

Browse Source 
es java options added
This commit is contained in:
Ivan Panteleev 2021-05-11 16:10:38 +03:00 committed by GitHub
commit 7d247d1ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sls/elasticsearch/config.sls
View File

@ -10,6 +10,7 @@ class NoAliasDumper(yaml.SafeDumper):
conf_path = '/etc/elasticsearch/' conf_path = '/etc/elasticsearch/'
log_path = '/var/log/elasticsearch/' log_path = '/var/log/elasticsearch/'
data_path = '/var/lib/elasticsearch/' data_path = '/var/lib/elasticsearch/'
es_java_opts = '-Des.transport.cname_in_publish_address=true'
packages_es = pillar('gentoo:portage:packages:app-misc/elasticsearch', {}) packages_es = pillar('gentoo:portage:packages:app-misc/elasticsearch', {})
es_version = packages_es.get('version', '=7.0.0') es_version = packages_es.get('version', '=7.0.0')
@ -149,7 +150,7 @@ File.managed(
template='jinja', source="salt://elasticsearch/files/elasticsearch.confd.tpl", template='jinja', source="salt://elasticsearch/files/elasticsearch.confd.tpl",
defaults={ defaults={
'conf_dir': conf_path, 'log_dir': log_path, 'data_dir': data_dir, 'conf_dir': conf_path, 'log_dir': log_path, 'data_dir': data_dir,
'es_java_opts': '', 'l_nofile': l_nofile, 'l_memlock': l_memlock, 'es_java_opts': es_java_opts , 'l_nofile': l_nofile, 'l_memlock': l_memlock,
'max_map_count': max_map_count, 'max_threads': max_threads, 'es_startup_sleep_time': 10}) 'max_map_count': max_map_count, 'max_threads': max_threads, 'es_startup_sleep_time': 10})
if tls: if tls: