Compilation results for kafka-main2007.codfw.wmnet: System changes detected
You can retrieve this result from host.json.Catalog differences
Summary
| Total Resources: | 2972 |
|---|---|
| Resources added: | 0 |
| Resources removed: | 0 |
| Resources modified: | 2 |
| Change percentage: | 0.07% |
Resources modified
- File[/etc/profile.d/kafka.sh]
- Content differences:
--- /etc/profile.d/kafka.sh.orig +++ /etc/profile.d/kafka.sh @@ -3,5 +3,6 @@ # These environment variables are used by /usr/local/bin/kafka # to automatically set common kafka CLI options. export KAFKA_ZOOKEEPER_URL=conf2004.codfw.wmnet,conf2005.codfw.wmnet,conf2006.codfw.wmnet/kafka/main-codfw -export KAFKA_BOOTSTRAP_SERVERS=kafka-main2006.codfw.wmnet:9092,kafka-main2007.codfw.wmnet:9092,kafka-main2008.codfw.wmnet:9092,kafka-main2009.codfw.wmnet:9092,kafka-main2010.codfw.wmnet:9092 +export KAFKA_BOOTSTRAP_SERVERS= +export KAFKA_BOOTSTRAP_TLS_SERVERS= export KAFKA_JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- Content differences:
- File[/usr/local/bin/kafka]
- Content differences:
--- /usr/local/bin/kafka.orig +++ /usr/local/bin/kafka @@ -23,13 +23,14 @@ $commands Environment Variables: - KAFKA_JAVA_HOME - Value of JAVA_HOME to use for invoking Kafka commands. - KAFKA_ZOOKEEPER_URL - If this is set, any commands that take a --zookeeper - flag will be given this value. - KAFKA_BOOTSTRAP_SERVERS - If this is set, any commands that take a --broker-list or - --bootstrap-server flag will be given this value. - Also any command that take a --authorizer-properties - will get the correct zookeeper.connect value. + KAFKA_JAVA_HOME - Value of JAVA_HOME to use for invoking Kafka commands. + KAFKA_ZOOKEEPER_URL - If this is set, any commands that take a --zookeeper + flag will be given this value. + KAFKA_BOOTSTRAP_SERVERS - If this is set, any commands that take a --broker-list or + --bootstrap-server flag will be given this value. + Also any command that take a --authorizer-properties + will get the correct zookeeper.connect value. + KAFKA_BOOTSTRAP_TLS_SERVERS - Used when mTLS is needed. " @@ -61,7 +62,11 @@ # also been passed in as a CLI arg. This will be included # in command functions that take a --bootstrap-server argument. if [ -n "${KAFKA_BOOTSTRAP_SERVERS}" ] && ! grep -q -- --bootstrap-server<<<"$@"; then - BOOTSTRAP_SERVER_OPT="--bootstrap-server ${KAFKA_BOOTSTRAP_SERVERS}" + if [ "$(id -u)" = "0" ]; then + BOOTSTRAP_SERVER_OPT="--bootstrap-server ${KAFKA_BOOTSTRAP_TLS_SERVERS}" + else + BOOTSTRAP_SERVER_OPT="--bootstrap-server ${KAFKA_BOOTSTRAP_SERVERS}" + fi fi # Each of these lists signifies that either --broker-list or --bootstrap-server
- Content differences: