Showing
5 changed files
with
15 additions
and
15 deletions
1 | CASSANDRA_DATA_DIR=/home/docker/cassandra_volume | 1 | CASSANDRA_DATA_DIR=/home/docker/cassandra_volume |
2 | 2 | ||
3 | # cassandra schema container environment variables | 3 | # cassandra schema container environment variables |
4 | -SKIP_SCHEMA_CREATION=false | ||
5 | -SKIP_SYSTEM_DATA=true | ||
6 | -SKIP_DEMO_DATA=true | 4 | +CREATE_SCHEMA=true |
5 | +ADD_SYSTEM_DATA=false | ||
6 | +ADD_DEMO_DATA=false | ||
7 | CASSANDRA_URL=cassandra | 7 | CASSANDRA_URL=cassandra |
@@ -29,9 +29,9 @@ services: | @@ -29,9 +29,9 @@ services: | ||
29 | tb-cassandra-schema: | 29 | tb-cassandra-schema: |
30 | image: "thingsboard/tb-cassandra-schema:1.2.4" | 30 | image: "thingsboard/tb-cassandra-schema:1.2.4" |
31 | environment: | 31 | environment: |
32 | - - SKIP_SCHEMA_CREATION=${SKIP_SCHEMA_CREATION} | ||
33 | - - SKIP_SYSTEM_DATA=${SKIP_SYSTEM_DATA} | ||
34 | - - SKIP_DEMO_DATA=${SKIP_DEMO_DATA} | 32 | + - CREATE_SCHEMA=${CREATE_SCHEMA} |
33 | + - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA} | ||
34 | + - ADD_DEMO_DATA=${ADD_DEMO_DATA} | ||
35 | - CASSANDRA_URL=${CASSANDRA_URL} | 35 | - CASSANDRA_URL=${CASSANDRA_URL} |
36 | entrypoint: ./install-schema.sh | 36 | entrypoint: ./install-schema.sh |
37 | cassandra: | 37 | cassandra: |
@@ -22,7 +22,7 @@ do | @@ -22,7 +22,7 @@ do | ||
22 | sleep 10 | 22 | sleep 10 |
23 | done | 23 | done |
24 | 24 | ||
25 | -if [ "$SKIP_SCHEMA_CREATION" == "false" ]; then | 25 | +if [ "$CREATE_SCHEMA" == "true" ]; then |
26 | echo "Creating 'Thingsboard' keyspace..." | 26 | echo "Creating 'Thingsboard' keyspace..." |
27 | cqlsh $CASSANDRA_URL -f /root/schema.cql | 27 | cqlsh $CASSANDRA_URL -f /root/schema.cql |
28 | if [ "$?" -eq 0 ]; then | 28 | if [ "$?" -eq 0 ]; then |
@@ -32,7 +32,7 @@ if [ "$SKIP_SCHEMA_CREATION" == "false" ]; then | @@ -32,7 +32,7 @@ if [ "$SKIP_SCHEMA_CREATION" == "false" ]; then | ||
32 | fi | 32 | fi |
33 | fi | 33 | fi |
34 | 34 | ||
35 | -if [ "$SKIP_SYSTEM_DATA" == "false" ]; then | 35 | +if [ "$ADD_SYSTEM_DATA" == "true" ]; then |
36 | echo "Adding system data..." | 36 | echo "Adding system data..." |
37 | cqlsh $CASSANDRA_URL -f /root/system-data.cql | 37 | cqlsh $CASSANDRA_URL -f /root/system-data.cql |
38 | if [ "$?" -eq 0 ]; then | 38 | if [ "$?" -eq 0 ]; then |
@@ -42,7 +42,7 @@ if [ "$SKIP_SYSTEM_DATA" == "false" ]; then | @@ -42,7 +42,7 @@ if [ "$SKIP_SYSTEM_DATA" == "false" ]; then | ||
42 | fi | 42 | fi |
43 | fi | 43 | fi |
44 | 44 | ||
45 | -if [ "$SKIP_DEMO_DATA" == "false" ]; then | 45 | +if [ "$ADD_DEMO_DATA" == "true" ]; then |
46 | echo "Adding demo data..." | 46 | echo "Adding demo data..." |
47 | cqlsh $CASSANDRA_URL -f /root/demo-data.cql | 47 | cqlsh $CASSANDRA_URL -f /root/demo-data.cql |
48 | if [ "$?" -eq 0 ]; then | 48 | if [ "$?" -eq 0 ]; then |
@@ -24,11 +24,11 @@ spec: | @@ -24,11 +24,11 @@ spec: | ||
24 | imagePullPolicy: Always | 24 | imagePullPolicy: Always |
25 | image: thingsboard/tb-cassandra-schema:1.2.4 | 25 | image: thingsboard/tb-cassandra-schema:1.2.4 |
26 | env: | 26 | env: |
27 | - - name: SKIP_SCHEMA_CREATION | 27 | + - name: CREATE_SCHEMA |
28 | value: "false" | 28 | value: "false" |
29 | - - name: SKIP_SYSTEM_DATA | 29 | + - name: ADD_SYSTEM_DATA |
30 | value: "false" | 30 | value: "false" |
31 | - - name : SKIP_DEMO_DATA | 31 | + - name : ADD_DEMO_DATA |
32 | value: "false" | 32 | value: "false" |
33 | - name : CASSANDRA_URL | 33 | - name : CASSANDRA_URL |
34 | value: "cassandra-headless" | 34 | value: "cassandra-headless" |
@@ -35,7 +35,7 @@ kind: ConfigMap | @@ -35,7 +35,7 @@ kind: ConfigMap | ||
35 | metadata: | 35 | metadata: |
36 | name: zk-config | 36 | name: zk-config |
37 | data: | 37 | data: |
38 | - ensemble: "zk-0;zk-1" | 38 | + ensemble: "zk-0;zk-1;zk-2" |
39 | replicas: "3" | 39 | replicas: "3" |
40 | jvm.heap: "500m" | 40 | jvm.heap: "500m" |
41 | tick: "2000" | 41 | tick: "2000" |
@@ -56,7 +56,7 @@ spec: | @@ -56,7 +56,7 @@ spec: | ||
56 | selector: | 56 | selector: |
57 | matchLabels: | 57 | matchLabels: |
58 | app: zk | 58 | app: zk |
59 | - minAvailable: 2 | 59 | + minAvailable: 3 |
60 | --- | 60 | --- |
61 | apiVersion: apps/v1beta1 | 61 | apiVersion: apps/v1beta1 |
62 | kind: StatefulSet | 62 | kind: StatefulSet |
@@ -64,7 +64,7 @@ metadata: | @@ -64,7 +64,7 @@ metadata: | ||
64 | name: zk | 64 | name: zk |
65 | spec: | 65 | spec: |
66 | serviceName: zk-headless | 66 | serviceName: zk-headless |
67 | - replicas: 2 | 67 | + replicas: 3 |
68 | template: | 68 | template: |
69 | metadata: | 69 | metadata: |
70 | labels: | 70 | labels: |