Commit 95954a30d36b3624cba300886f4cb66820ba9272

Authored by volodymyr-babak
1 parent cdf02c66

Revert cassandra url

... ... @@ -115,9 +115,7 @@ cassandra:
115 115 # Thingsboard keyspace name
116 116 keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}"
117 117 # Specify node list
118   - host: "${CASSANDRA_HOST:127.0.0.1}"
119   - # Specify node list
120   - post: "${CASSANDRA_PORT:9042}"
  118 + url: "${CASSANDRA_URL:127.0.0.1:9042}"
121 119 # Enable/disable secure connection
122 120 ssl: "${CASSANDRA_USE_SSL:false}"
123 121 # Enable/disable JMX
... ...
... ... @@ -44,7 +44,7 @@ public abstract class AbstractCassandraCluster {
44 44
45 45 @Value("${cassandra.cluster_name}")
46 46 private String clusterName;
47   - @Value("${cassandra.host}:${cassandra.port}")
  47 + @Value("${cassandra.url}")
48 48 private String url;
49 49 @Value("${cassandra.compression}")
50 50 private String compression;
... ...
... ... @@ -2,9 +2,7 @@ cassandra.cluster_name=Thingsboard Cluster
2 2
3 3 cassandra.keyspace_name=thingsboard
4 4
5   -cassandra.host=127.0.0.1
6   -
7   -cassandra.port=9142
  5 +cassandra.url=127.0.0.1:9142
8 6
9 7 cassandra.ssl=false
10 8
... ...
... ... @@ -50,6 +50,7 @@ metadata:
50 50 data:
51 51 zookeeper.enabled: "true"
52 52 zookeeper.url: "zk-headless"
  53 + cassandra.url: "cassandra-headless:9042"
53 54 cassandra.host: "cassandra-headless"
54 55 cassandra.port: "9042"
55 56 database.type: "cassandra"
... ... @@ -112,6 +113,11 @@ spec:
112 113 configMapKeyRef:
113 114 name: tb-config
114 115 key: cassandra.port
  116 + - name : CASSANDRA_URL
  117 + valueFrom:
  118 + configMapKeyRef:
  119 + name: tb-config
  120 + key: cassandra.url
115 121 - name: DATABASE_TYPE
116 122 valueFrom:
117 123 configMapKeyRef:
... ...
... ... @@ -8,9 +8,10 @@ COAP_BIND_PORT=5683
8 8 ZOOKEEPER_URL=zk:2181
9 9
10 10 # type of database to use: sql[DEFAULT] or cassandra
11   -DATABASE_TYPE=cassandra
  11 +DATABASE_TYPE=sql
12 12
13 13 # cassandra db config
  14 +CASSANDRA_URL=cassandra:9042
14 15 CASSANDRA_HOST=cassandra
15 16 CASSANDRA_PORT=9042
16 17
... ...