diff --git a/salt/kafka/nodes.sls b/salt/kafka/nodes.sls index 7cafb10bc..cae2a1d0f 100644 --- a/salt/kafka/nodes.sls +++ b/salt/kafka/nodes.sls @@ -15,11 +15,4 @@ write_kafka_pillar_yaml: - source: salt://kafka/files/managed_node_pillar.jinja - template: jinja - context: - COMBINED_KAFKANODES: {{ COMBINED_KAFKANODES }} - - -{% if kafka_cluster_id is none %} -generate_kafka_cluster_id: - cmd.run: - - name: /usr/sbin/so-kafka-clusterid -{% endif %} \ No newline at end of file + COMBINED_KAFKANODES: {{ COMBINED_KAFKANODES }} \ No newline at end of file diff --git a/salt/manager/tools/sbin/so-kafka-clusterid b/salt/manager/tools/sbin/so-kafka-clusterid deleted file mode 100644 index c4e449448..000000000 --- a/salt/manager/tools/sbin/so-kafka-clusterid +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# 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. - - - -### THIS SCRIPT AND SALT STATE REFERENCES TO THIS SCRIPT TO BE REMOVED ONCE INITIAL TESTING IS DONE - THESE VALUES WILL GENERATED IN SETUP AND SOUP - - -local_salt_dir=/opt/so/saltstack/local - -if [[ -f /usr/sbin/so-common ]]; then - source /usr/sbin/so-common -else - source $(dirname $0)/../../../common/tools/sbin/so-common -fi - -if ! grep -q "^ cluster_id:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then - kafka_cluster_id=$(get_random_value 22) - echo ' cluster_id: '$kafka_cluster_id >> $local_salt_dir/pillar/kafka/soc_kafka.sls -fi - -if ! grep -q "^ kafka_pass:" $local_salt_dir/pillar/kafka/soc_kafka.sls; then - kafkapass=$(get_random_value) - echo ' kafka_pass: '$kafkapass >> $local_salt_dir/pillar/kafka/soc_kafka.sls -fi \ No newline at end of file