thingsboard-memoizeit
Changes
docker/.env 6(+3 -3)
docker/docker-compose.yml 6(+3 -3)
docker/zookeeper/zookeeper.yaml 6(+3 -3)
Details
docker/.env 6(+3 -3)
diff --git a/docker/.env b/docker/.env
index c03637e..1c7e512 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,7 +1,7 @@
CASSANDRA_DATA_DIR=/home/docker/cassandra_volume
# cassandra schema container environment variables
-SKIP_SCHEMA_CREATION=false
-SKIP_SYSTEM_DATA=true
-SKIP_DEMO_DATA=true
+CREATE_SCHEMA=true
+ADD_SYSTEM_DATA=false
+ADD_DEMO_DATA=false
CASSANDRA_URL=cassandra
\ No newline at end of file
docker/docker-compose.yml 6(+3 -3)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ebf1202..8367abc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -29,9 +29,9 @@ services:
tb-cassandra-schema:
image: "thingsboard/tb-cassandra-schema:1.2.4"
environment:
- - SKIP_SCHEMA_CREATION=${SKIP_SCHEMA_CREATION}
- - SKIP_SYSTEM_DATA=${SKIP_SYSTEM_DATA}
- - SKIP_DEMO_DATA=${SKIP_DEMO_DATA}
+ - CREATE_SCHEMA=${CREATE_SCHEMA}
+ - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA}
+ - ADD_DEMO_DATA=${ADD_DEMO_DATA}
- CASSANDRA_URL=${CASSANDRA_URL}
entrypoint: ./install-schema.sh
cassandra:
diff --git a/docker/tb-cassandra-schema/install-schema.sh b/docker/tb-cassandra-schema/install-schema.sh
index 672a345..128bd16 100644
--- a/docker/tb-cassandra-schema/install-schema.sh
+++ b/docker/tb-cassandra-schema/install-schema.sh
@@ -22,7 +22,7 @@ do
sleep 10
done
-if [ "$SKIP_SCHEMA_CREATION" == "false" ]; then
+if [ "$CREATE_SCHEMA" == "true" ]; then
echo "Creating 'Thingsboard' keyspace..."
cqlsh $CASSANDRA_URL -f /root/schema.cql
if [ "$?" -eq 0 ]; then
@@ -32,7 +32,7 @@ if [ "$SKIP_SCHEMA_CREATION" == "false" ]; then
fi
fi
-if [ "$SKIP_SYSTEM_DATA" == "false" ]; then
+if [ "$ADD_SYSTEM_DATA" == "true" ]; then
echo "Adding system data..."
cqlsh $CASSANDRA_URL -f /root/system-data.cql
if [ "$?" -eq 0 ]; then
@@ -42,7 +42,7 @@ if [ "$SKIP_SYSTEM_DATA" == "false" ]; then
fi
fi
-if [ "$SKIP_DEMO_DATA" == "false" ]; then
+if [ "$ADD_DEMO_DATA" == "true" ]; then
echo "Adding demo data..."
cqlsh $CASSANDRA_URL -f /root/demo-data.cql
if [ "$?" -eq 0 ]; then
diff --git a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
index e3340a4..e1e2722 100644
--- a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
+++ b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
@@ -24,11 +24,11 @@ spec:
imagePullPolicy: Always
image: thingsboard/tb-cassandra-schema:1.2.4
env:
- - name: SKIP_SCHEMA_CREATION
+ - name: CREATE_SCHEMA
value: "false"
- - name: SKIP_SYSTEM_DATA
+ - name: ADD_SYSTEM_DATA
value: "false"
- - name : SKIP_DEMO_DATA
+ - name : ADD_DEMO_DATA
value: "false"
- name : CASSANDRA_URL
value: "cassandra-headless"
docker/zookeeper/zookeeper.yaml 6(+3 -3)
diff --git a/docker/zookeeper/zookeeper.yaml b/docker/zookeeper/zookeeper.yaml
index d027f8e..d96a744 100644
--- a/docker/zookeeper/zookeeper.yaml
+++ b/docker/zookeeper/zookeeper.yaml
@@ -35,7 +35,7 @@ kind: ConfigMap
metadata:
name: zk-config
data:
- ensemble: "zk-0;zk-1"
+ ensemble: "zk-0;zk-1;zk-2"
replicas: "3"
jvm.heap: "500m"
tick: "2000"
@@ -56,7 +56,7 @@ spec:
selector:
matchLabels:
app: zk
- minAvailable: 2
+ minAvailable: 3
---
apiVersion: apps/v1beta1
kind: StatefulSet
@@ -64,7 +64,7 @@ metadata:
name: zk
spec:
serviceName: zk-headless
- replicas: 2
+ replicas: 3
template:
metadata:
labels: