From e7abbf19afbbccd68493b3b9c3d068ead6f4e6fd Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 8 Oct 2020 11:17:26 -0400 Subject: [PATCH] fix templates not applying to searchnode. so-searchnode role doesnt exists searchnodes are so-node role --- salt/curator/files/bin/so-curator-closed-delete-delete | 2 +- salt/elasticsearch/init.sls | 2 +- salt/ssl/init.sls | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/curator/files/bin/so-curator-closed-delete-delete b/salt/curator/files/bin/so-curator-closed-delete-delete index 0d894db2f..90abdcccd 100755 --- a/salt/curator/files/bin/so-curator-closed-delete-delete +++ b/salt/curator/files/bin/so-curator-closed-delete-delete @@ -1,7 +1,7 @@ #!/bin/bash -{%- if grains['role'] in ['so-node', 'so-searchnode', 'so-heavynode'] %} +{%- if grains['role'] in ['so-node', 'so-heavynode'] %} {%- set ELASTICSEARCH_HOST = salt['pillar.get']('elasticsearch:mainip', '') -%} {%- set ELASTICSEARCH_PORT = salt['pillar.get']('elasticsearch:es_port', '') -%} {%- set LOG_SIZE_LIMIT = salt['pillar.get']('elasticsearch:log_size_limit', '') -%} diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls index 4dcf3d44f..c43edba23 100644 --- a/salt/elasticsearch/init.sls +++ b/salt/elasticsearch/init.sls @@ -237,7 +237,7 @@ so-elasticsearch-pipelines: - file: esyml - file: so-elasticsearch-pipelines-file -{% if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-searchnode', 'so-import'] and TEMPLATES %} +{% if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone', 'so-heavynode', 'so-node', 'so-import'] and TEMPLATES %} so-elasticsearch-templates: cmd.run: - name: /usr/sbin/so-elasticsearch-templates-load diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 6961144bf..49e87f784 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -390,7 +390,7 @@ fleetkeyperms: - group: 939 {% endif %} -{% if grains['role'] in ['so-sensor', 'so-manager', 'so-node', 'so-searchnode', 'so-eval', 'so-helix', 'so-managersearch', 'so-heavynode', 'so-fleet', 'so-standalone', 'so-import'] %} +{% if grains['role'] in ['so-sensor', 'so-manager', 'so-node', 'so-eval', 'so-helix', 'so-managersearch', 'so-heavynode', 'so-fleet', 'so-standalone', 'so-import'] %} fbcertdir: file.directory: @@ -527,7 +527,7 @@ fleetkeyperms: {% endif %} -{% if grains['role'] in ['so-node', 'so-searchnode'] %} +{% if grains['role'] == 'so-node' %} # Create a cert for elasticsearch /etc/pki/elasticsearch.key: x509.private_key_managed: