diff --git a/salt/kafka/controllers.sls b/salt/kafka/controllers.sls deleted file mode 100644 index c6df07b0c..000000000 --- a/salt/kafka/controllers.sls +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one -# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at -# https://securityonion.net/license; you may not use this file except in compliance with the -# Elastic License 2.0. - -{% from 'allowed_states.map.jinja' import allowed_states %} -{% if sls.split('.')[0] in allowed_states %} -{% import_yaml 'kafka/defaults.yaml' as KAFKADEFAULTS %} - -{% set process_x_roles = salt['pillar.get']('kafka:config:server:process_x_roles', KAFKADEFAULTS.kafka.config.server.process_x_roles, merge=true) %} - -{# Send an event to the salt master at every highstate. Containing the minions process_x_roles. - if no value is set for this minion then the default in kafka/defaults.yaml is used #} -push_event_to_master: - event.send: - - name: kafka/controllers_update - - data: - id: {{ grains['id'] }} - process_x_roles: {{ process_x_roles }} -{% endif %} diff --git a/salt/salt/files/reactor.conf b/salt/salt/files/reactor.conf deleted file mode 100644 index 129305572..000000000 --- a/salt/salt/files/reactor.conf +++ /dev/null @@ -1,3 +0,0 @@ -reactor: - - 'kafka/controllers_update': - - salt://reactor/kafka.sls \ No newline at end of file diff --git a/salt/salt/master.sls b/salt/salt/master.sls index d28f0b1bd..51acca61d 100644 --- a/salt/salt/master.sls +++ b/salt/salt/master.sls @@ -37,11 +37,6 @@ engines_config: - name: /etc/salt/master.d/engines.conf - source: salt://salt/files/engines.conf -reactor_config: - file.managed: - - name: /etc/salt/master.d/reactor.conf - - source: salt://salt/files/reactor.conf - salt_master_service: service.running: - name: salt-master