summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-19 17:44:45 -0400
committerDan Timoney <dtimoney@att.com>2017-09-19 17:44:45 -0400
commit70f926531ac1833104c0c4b6fd5e332ab0112a23 (patch)
tree68de4f1b89ee8a68d6f5788cf7c445a13756ecbd
parent1bc6ad35d813962f2d0c2218dfc69869085ebfde (diff)
Fix dblib driver property
dblib.properties file contains wrong name for JDBC driver property Change-Id: I989ef7076bbadb44e3be9554fe39384ef685ca82 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r--odlsli/src/main/properties/dblib.properties2
-rw-r--r--src/main/yaml/docker-compose.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/odlsli/src/main/properties/dblib.properties b/odlsli/src/main/properties/dblib.properties
index d6d9f34e..9506ac8d 100644
--- a/odlsli/src/main/properties/dblib.properties
+++ b/odlsli/src/main/properties/dblib.properties
@@ -24,7 +24,7 @@ org.onap.ccsdk.sli.dbtype=jdbc
org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01
org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
-org.openecomp.sdnc.sli.jdbc.driver=org.mariadb.jdbc.Driver
+org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver
org.onap.ccsdk.sli.jdbc.database=sdnctl
org.onap.ccsdk.sli.jdbc.user=sdnctl
org.onap.ccsdk.sli.jdbc.password=gamma
diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml
index 352057de..bd66b052 100644
--- a/src/main/yaml/docker-compose.yml
+++ b/src/main/yaml/docker-compose.yml
@@ -22,6 +22,10 @@ services:
entrypoint: ["/opt/opendaylight/current/bin/karaf"]
ports:
- "18181:8181"
+ links:
+ - db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
environment:
- MYSQL_ROOT_PASSWORD=openECOMP1.0
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties