From 639bf050812e98ce6155465314a6fa9614d615b8 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 3 Apr 2024 08:52:26 -0400
Subject: [PATCH] add so-manager to kafka.nodes pillar

---
 pillar/kafka/nodes.sls                                |  4 ++--
 salt/kafka/config.sls                                 | 11 +++++------
 .../kafka/tools/sbin_jinja/so-kafka-generate-keystore |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pillar/kafka/nodes.sls b/pillar/kafka/nodes.sls
index a7d97ac9c..8fdd3ee07 100644
--- a/pillar/kafka/nodes.sls
+++ b/pillar/kafka/nodes.sls
@@ -1,4 +1,4 @@
-{% set current_kafkanodes = salt.saltutil.runner('mine.get', tgt='G@role:so-kafkanode', fun='network.ip_addrs', tgt_type='compound') %}
+{% set current_kafkanodes = salt.saltutil.runner('mine.get', tgt='G@role:so-kafkanode or G@role:so-manager', fun='network.ip_addrs', tgt_type='compound') %}
 {% set pillar_kafkanodes = salt['pillar.get']('kafka:nodes', default={}, merge=True) %}
 
 {% set existing_ids = [] %}
@@ -27,4 +27,4 @@
 {% endfor %}
 
 kafka:
-  nodes: {{ final_nodes|tojson }}
\ No newline at end of file
+  nodes: {{ final_nodes|tojson }}
diff --git a/salt/kafka/config.sls b/salt/kafka/config.sls
index ddf2777a1..c8d6f66e0 100644
--- a/salt/kafka/config.sls
+++ b/salt/kafka/config.sls
@@ -63,6 +63,8 @@ kafka_sbin_jinja_tools:
     - group: 960
     - file_mode: 755
     - template: jinja
+    - defaults:
+        GLOBALS: {{ GLOBALS }}
 
 kakfa_log_dir:
   file.directory:
@@ -79,12 +81,9 @@ kafka_data_dir:
     - makedirs: True
 
 kafka_keystore_script:
-  cmd.script:
-    - source: salt://kafka/tools/sbin_jinja/so-kafka-generate-keystore
-    - template: jinja
+  cmd.run:
+    - name: /usr/sbin/so-kafka-generate-keystore
     - cwd: /opt/so
-    - defaults:
-        GLOBALS: {{ GLOBALS }}
 
 kafka_kraft_server_properties:
   file.managed:
@@ -106,4 +105,4 @@ kafka_kraft_server_properties:
   test.fail_without_changes:
     - name: {{sls}}_state_not_allowed
 
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/salt/kafka/tools/sbin_jinja/so-kafka-generate-keystore b/salt/kafka/tools/sbin_jinja/so-kafka-generate-keystore
index 1809c7a93..26f188377 100644
--- a/salt/kafka/tools/sbin_jinja/so-kafka-generate-keystore
+++ b/salt/kafka/tools/sbin_jinja/so-kafka-generate-keystore
@@ -13,4 +13,4 @@ if [ ! -f /etc/pki/kafka.jks ]; then
     docker rm so-kafka-keystore
 else
     exit 0
-fi
\ No newline at end of file
+fi