Revert cassandra url

application/src/main/resources/thingsboard.yml

@@ -115,9 +115,7 @@ cassandra:
   # Thingsboard keyspace name
   keyspace_name: "${CASSANDRA_KEYSPACE_NAME:thingsboard}"
   # Specify node list
-  host: "${CASSANDRA_HOST:127.0.0.1}"
-  # Specify node list
-  post: "${CASSANDRA_PORT:9042}"
+  url: "${CASSANDRA_URL:127.0.0.1:9042}"
   # Enable/disable secure connection
   ssl: "${CASSANDRA_USE_SSL:false}"
   # Enable/disable JMX

dao/src/main/java/org/thingsboard/server/dao/cassandra/AbstractCassandraCluster.java

@@ -44,7 +44,7 @@ public abstract class AbstractCassandraCluster {
 
     @Value("${cassandra.cluster_name}")
     private String clusterName;
-    @Value("${cassandra.host}:${cassandra.port}")
+    @Value("${cassandra.url}")
     private String url;
     @Value("${cassandra.compression}")
     private String compression;

dao/src/test/resources/cassandra-test.properties

@@ -2,9 +2,7 @@ cassandra.cluster_name=Thingsboard Cluster
 
 cassandra.keyspace_name=thingsboard
 
-cassandra.host=127.0.0.1
-
-cassandra.port=9142
+cassandra.url=127.0.0.1:9142
 
 cassandra.ssl=false
 

docker/k8s/tb.yaml

@@ -50,6 +50,7 @@ metadata:
 data:
   zookeeper.enabled: "true"
   zookeeper.url: "zk-headless"
+  cassandra.url: "cassandra-headless:9042"
   cassandra.host: "cassandra-headless"
   cassandra.port: "9042"
   database.type: "cassandra"
@@ -112,6 +113,11 @@ spec:
             configMapKeyRef:
               name: tb-config
               key: cassandra.port
+        - name : CASSANDRA_URL
+          valueFrom:
+            configMapKeyRef:
+              name: tb-config
+              key: cassandra.url
         - name: DATABASE_TYPE
           valueFrom:
             configMapKeyRef:

docker/tb.env

@@ -8,9 +8,10 @@ COAP_BIND_PORT=5683
 ZOOKEEPER_URL=zk:2181
 
 # type of database to use: sql[DEFAULT] or cassandra
-DATABASE_TYPE=cassandra
+DATABASE_TYPE=sql
 
 # cassandra db config
+CASSANDRA_URL=cassandra:9042
 CASSANDRA_HOST=cassandra
 CASSANDRA_PORT=9042