From 96935a488777ae8eebe57e7f1b08f9ca9523a29c Mon Sep 17 00:00:00 2001
From: tmelhiser <tmelhiser@integratedsecure.com>
Date: Tue, 5 Jun 2018 12:35:06 -0500
Subject: [PATCH] Updated gen.conf.tmpl.sh to look for an existing
 meta.properties value for the broker ID.

This patch references Issue #6
---
 root/opt/tools/confd/bin/gen.conf.tmpl.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/root/opt/tools/confd/bin/gen.conf.tmpl.sh b/root/opt/tools/confd/bin/gen.conf.tmpl.sh
index bc35a67..ad10997 100644
--- a/root/opt/tools/confd/bin/gen.conf.tmpl.sh
+++ b/root/opt/tools/confd/bin/gen.conf.tmpl.sh
@@ -36,9 +36,23 @@ keys = [
 reload_cmd = "${SERVICE_HOME}/bin/kafka-service.sh restart"
 EOF
 
+[ -e ${KAFKA_LOG_DIRS}/meta.properties ] && {
+   BROKER_ID=$(grep ^broker.id ${KAFKA_LOG_DIRS}/meta.properties|awk -F= '{print $2}');
+}
+
+[ -z "${BROKER_ID}" ] && {
 cat << EOF > ${SERVICE_VOLUME}/confd/etc/templates/server.properties.tmpl
 ############################# Server Basics #############################
 broker.id={{getv "/self/container/service_index"}}
+EOF
+} || {
+cat << EOF > ${SERVICE_VOLUME}/confd/etc/templates/server.properties.tmpl
+############################# Server Basics #############################
+broker.id=${BROKER_ID}
+EOF
+}
+
+cat << EOF >> ${SERVICE_VOLUME}/confd/etc/templates/server.properties.tmpl
 ############################# Socket Server Settings #############################
 listeners=${KAFKA_LISTENER}
 advertised.listeners=${KAFKA_ADVERTISE_LISTENER}