Skip to content

Commit 1e14030

Browse files
author
tikitavi
committed
fix bugs for cassandra-reaper
make keystore dir a parameter - differs for operator collect cassandras connect points in the beginning Partial-Jira-bug: CEM-28731 Signed-off-by: tikitavi <akravets@juniper.net> Change-Id: Iabd3ee087219852c426f7167184f3a88c30c5c2e
1 parent 89cc217 commit 1e14030

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

containers/external/cassandra/contrail-entrypoint.sh

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ if [ -z "$my_ip" ]; then
2828
exit -1
2929
fi
3030

31+
# get info about all cassandras for reaper
32+
export CASSANDRA_COUNT=$(echo $CASSANDRA_SEEDS | tr ',' ' ' | wc -w)
33+
export CASSANDRA_CONNECT_POINTS=$(echo $CASSANDRA_SEEDS | sed 's/,/", "/g')
3134
# use first two servers as seeds
3235
export CASSANDRA_SEEDS=$(echo $CASSANDRA_SEEDS | cut -d ',' -f 1,2)
3336
export CASSANDRA_LISTEN_ADDRESS=$my_ip

containers/external/cassandra/run-reaper.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ source /common.sh
55
cp /etc/cassandra-reaper/cassandra-reaper.origin /etc/cassandra-reaper/cassandra-reaper.yaml
66
chmod 666 /var/log/cassandra-reaper/reaper.log
77

8-
# get info about all cassandras for reaper
9-
CASSANDRA_COUNT=$(echo $CASSANDRA_SEEDS | tr ',' ' ' | wc -w)
10-
CASSANDRA_CONNECT_POINTS=$(echo $CASSANDRA_SEEDS | sed 's/,/", "/g')
11-
128
# edit cassandra-reaper config
139
REAPER_CONFIG=${CASSANDRA_REAPER_CONFIG}/cassandra-reaper.yaml
1410
sed -i "s/port: 8080/port: ${CASSANDRA_REAPER_APP_PORT}/g" ${REAPER_CONFIG}
1511
sed -i "s/port: 8081/port: ${CASSANDRA_REAPER_ADM_PORT}/g" ${REAPER_CONFIG}
12+
sed -i "s/level: INFO/level: DEBUG/g" ${REAPER_CONFIG}
1613
sed -i 's%classpath:shiro.ini%file:/etc/cassandra-reaper/configs/shiro.ini%g' ${REAPER_CONFIG}
1714

1815
cat <<EOF >>${REAPER_CONFIG}
@@ -97,7 +94,7 @@ if is_enabled $CASSANDRA_SSL_ENABLE ; then
9794
type: jdk
9895
EOF
9996

100-
jks_dir='/usr/local/lib/cassandra/conf'
97+
jks_dir=${JKS_DIR:-'/usr/local/lib/cassandra/conf'}
10198
cat <<EOF >/etc/cassandra-reaper/cassandra-reaper-ssl.properties
10299
-Dssl.enable=true
103100
-Djavax.net.ssl.keyStore=${jks_dir}/server-keystore.jks

0 commit comments

Comments
 (0)