summaryrefslogtreecommitdiffstats
path: root/kubernetes/common
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2021-07-20 09:58:06 +0000
committerGerrit Code Review <gerrit@onap.org>2021-07-20 09:58:06 +0000
commit9c30c1f14ebc6124c64bda3b9a2d5c67eba818ec (patch)
tree0f9387b694fedf4d90008501c9203a6773901c3c /kubernetes/common
parent68dd3ba1c943661a3d49d117883cc3073f4829fc (diff)
parentc2dd7440af7f410ec58d8c3b94f95434f0eafc87 (diff)
Merge "[COMMON] Fix a docker-entrypoint function name"
Diffstat (limited to 'kubernetes/common')
-rw-r--r--kubernetes/common/cassandra/resources/config/docker-entrypoint.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
index 5f23a89867..c01d7c6d57 100644
--- a/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
+++ b/kubernetes/common/cassandra/resources/config/docker-entrypoint.sh
@@ -28,7 +28,7 @@ _ip_address() {
}
# "sed -i", but without "mv" (which doesn't work on a bind-mounted file, for example)
-_sed-in-place() {
+_sed_in_place() {
local filename="$1"; shift
local tempFile
tempFile="$(mktemp)"
@@ -57,7 +57,7 @@ if [ "$1" = 'cassandra' ]; then
fi
: ${CASSANDRA_SEEDS:="$CASSANDRA_BROADCAST_ADDRESS"}
- _sed-in-place "$CASSANDRA_CONFIG/cassandra.yaml" \
+ _sed_in_place "$CASSANDRA_CONFIG/cassandra.yaml" \
-r 's/(- seeds:).*/\1 "'"$CASSANDRA_SEEDS"'"/'
for yaml in \
@@ -75,7 +75,7 @@ if [ "$1" = 'cassandra' ]; then
# eval presents no security issue here because of limited possible values of var
eval val=\$$var
if [ "$val" ]; then
- _sed-in-place "$CASSANDRA_CONFIG/cassandra.yaml" \
+ _sed_in_place "$CASSANDRA_CONFIG/cassandra.yaml" \
-r 's/^(# )?('"$yaml"':).*/\2 '"$val"'/'
fi
done
@@ -85,7 +85,7 @@ if [ "$1" = 'cassandra' ]; then
# eval presents no security issue here because of limited possible values of var
eval val=\$$var
if [ "$val" ]; then
- _sed-in-place "$CASSANDRA_CONFIG/cassandra-rackdc.properties" \
+ _sed_in_place "$CASSANDRA_CONFIG/cassandra-rackdc.properties" \
-r 's/^('"$rackdc"'=).*/\1 '"$val"'/'
fi
done