From c5c943f6a4c8437c5ea6a68a71303ae971fd4c40 Mon Sep 17 00:00:00 2001
From: Daniel Yu <danielmethod@gmail.com>
Date: Thu, 10 Aug 2017 14:15:12 +0800
Subject: [PATCH] address comments, using generic db service

---
 .../thingsboard/0/docker-compose.yml.tpl      | 37 ++++++++-----------
 templates/thingsboard/0/rancher-compose.yml   |  6 +--
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/templates/thingsboard/0/docker-compose.yml.tpl b/templates/thingsboard/0/docker-compose.yml.tpl
index e2ba806..cb43fa0 100644
--- a/templates/thingsboard/0/docker-compose.yml.tpl
+++ b/templates/thingsboard/0/docker-compose.yml.tpl
@@ -13,44 +13,37 @@ services:
       - COAP_BIND_PORT=5683
       - ZOOKEEPER_URL=zk:2181
       - DATABASE_TYPE=${database_type}
-      - CASSANDRA_URL=cassandra:9042
-      - CASSANDRA_HOST=cassandra
+      {{- if eq .Values.database_type "cassandra" }}
+      - CASSANDRA_URL=db:9042
+      - CASSANDRA_HOST=db
       - CASSANDRA_PORT=9042
-      - POSTGRES_HOST=postgres
+      {{- else }}
+      - POSTGRES_HOST=db
       - POSTGRES_PORT=5432
+      {{- end }}
       - ADD_SCHEMA_AND_SYSTEM_DATA=${add_schema_and_system_data}
       - ADD_DEMO_DATA=${add_demo_data}
     volumes:
       - hsqldb_data_dir:/usr/share/thingsboard/data/sql
     depends_on:
-      {{- if eq .Values.database_type "cassandra" }}
-      - cassandra
-      {{- else }}
-      - postgres
-      {{- end }} 
+      - db
     external_links:
       - ${zookeeper_service}:zk    
     entrypoint: /run-application.sh
-  {{- if eq .Values.database_type "cassandra" }}  
-  cassandra:
+  db:  
+    {{- if eq .Values.database_type "cassandra" }}  
     image: "cassandra:3"
     volumes:
-      - cassandra_data_dir:/var/lib/cassandra
-  {{- else }}   
-  postgres:
+      - db_data_dir:/var/lib/cassandra
+    {{- else }}   
     image: "postgres:9.6"
     environment:
       - POSTGRES_DB=${postgres_db}
     volumes:
-      - postgres_data_dir:/var/lib/postgresql/data
-  {{- end }}    
+      - db_data_dir:/var/lib/postgresql/data
+    {{- end }}    
 volumes:
   hsqldb_data_dir:
     driver: ${volume_driver}
-  {{- if eq .Values.database_type "cassandra" }}  
-  cassandra_data_dir:
-    driver: ${volume_driver}
-  {{- else }}  
-  postgres_data_dir:
-    driver: ${volume_driver}
-  {{- end }}  
\ No newline at end of file
+  db_data_dir:
+    driver: ${volume_driver}
\ No newline at end of file
diff --git a/templates/thingsboard/0/rancher-compose.yml b/templates/thingsboard/0/rancher-compose.yml
index 4932190..635b196 100644
--- a/templates/thingsboard/0/rancher-compose.yml
+++ b/templates/thingsboard/0/rancher-compose.yml
@@ -24,13 +24,13 @@ catalog:
       default: "5683"
       type: int
     - variable: database_type
-      description: "Choose database type to use: postgres or cassandra"
+      description: "Choose database type to use: sql or cassandra"
       label: "Database type"
       required: true
-      default: "postgres"
+      default: "sql"
       type: enum
       options:
-        - postgres
+        - sql
         - cassandra
     - variable: add_schema_and_system_data
       description: "Whether to init scheme and system data"