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

Add support for elastic:tls:<proto>:enabled

Browse Source
This commit is contained in:
Antsiferov Grigory 2019-04-24 13:04:28 +03:00
parent f5d014c686
commit f7e78f9fdf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sls/elasticsearch/config.sls
View File

@ -72,10 +72,11 @@ config = {
config['discovery']['zen']['ping']['unicast']['hosts'] = filter( config['discovery']['zen']['ping']['unicast']['hosts'] = filter(
lambda x: x != fqdn and x not in fqdn_ipv6, lambda x: x != fqdn and x not in fqdn_ipv6,
hosts) hosts)
if tls_enabled: if tls:
config['opendistro_security'] = { config['opendistro_security'] = {
'ssl': { 'ssl': {
'http': { 'http': {
'enabled': tls_http.get('enabled', tls_enabled),
'enable_openssl_if_available': True, 'enable_openssl_if_available': True,
'pemcert_filepath': 'http-cert.pem', 'pemcert_filepath': 'http-cert.pem',
'pemkey_filepath': 'http-key.pem', 'pemkey_filepath': 'http-key.pem',
@ -83,6 +84,7 @@ if tls_enabled:
'clientauth_mode': tls_http.get('clientauth_mode', 'OPTIONAL') 'clientauth_mode': tls_http.get('clientauth_mode', 'OPTIONAL')
}, },
'transport': { 'transport': {
'enabled': tls_transport.get('enabled', tls_enabled),
'enable_openssl_if_available': True, 'enable_openssl_if_available': True,
'pemcert_filepath': 'transport-cert.pem', 'pemcert_filepath': 'transport-cert.pem',
'pemkey_filepath': 'transport-key.pem', 'pemkey_filepath': 'transport-key.pem',
@ -117,7 +119,7 @@ File.managed(
'es_java_opts': '', 'l_nofile': l_nofile, 'l_memlock': l_memlock, '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_enabled: if tls:
for proto in ('transport', 'http'): for proto in ('transport', 'http'):
for pemtype in ('cert', 'key', 'ca'): for pemtype in ('cert', 'key', 'ca'):
File.managed( File.managed(