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