Remove airgap-specific logic for ingest.geoip.downloader

This commit is contained in:
weslambert
2022-08-03 09:21:03 -04:00
committed by GitHub
parent 811063268f
commit 9ac640fa67

View File

@@ -1,6 +1,5 @@
{% import_yaml 'elasticsearch/defaults.yaml' as ESCONFIG with context %}
{% set HIGHLANDER = salt['pillar.get']('global:highlander', False) %}
{% set ISAIRGAP = salt['pillar.get']('global:airgap', False) %}
{% if not salt['pillar.get']('elasticsearch:auth:enabled', False) %}
{% do ESCONFIG.elasticsearch.config.xpack.security.authc.anonymous.update({'username': 'anonymous_user', 'roles': 'superuser', 'authz_exception': 'true'}) %}
@@ -34,10 +33,6 @@
{% endif %}
{% endif %}
{% if ISAIRGAP %}
{% do ESCONFIG.elasticsearch.config.ingest.geoip.downloader.update({'enabled': false}) %}
{% endif %}
{# merge with the elasticsearch pillar #}
{% set ESCONFIG = salt['pillar.get']('elasticsearch:config', default=ESCONFIG.elasticsearch.config, merge=True) %}