Modifying code to point to AAIService Properties

Adding dblib.properties (mysql credential properties to the sdnctl db),
modifying setenv.sh (used to define property values to mysql
- such as authenticating against the MySQL DB's) and adding the
APPC_CONFIG_DIR env variable as part of the Dockerfile.

Patch: Reverted Unintentional changes to the docker-compose template.
Patch: Changed some formatting as per Marcus's suggestions

Change-Id: I7cf9d90405bb4d552779cd0cd8a4f01525bdd823
Signed-off-by: Hector Anapan <ha076r@att.com>
Issue: [APPC-129]

2 files changed, 41 insertions, 3 deletions

diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 7be2093..535b2be 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -2,10 +2,12 @@
 FROM openecomp/sdnc-image:1.1.2-SNAPSHOT
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
-# copy openecomp
-COPY opt /opt
+# Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
+ENV APPC_CONFIG_DIR /opt/openecomp/appc/data/properties
 
+# Copy the opt folder to the container's /opt folder
+COPY opt /opt
 RUN ln -s /opt/openecomp/appc /opt/appc
 
-# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
+#Expose port 8181 for ODL REST calls
 EXPOSE 8181
diff --git a/installation/src/main/properties/dblib.properties b/installation/src/main/properties/dblib.properties
new file mode 100644
index 0000000..1523a37
--- /dev/null
+++ b/installation/src/main/properties/dblib.properties
@@ -0,0 +1,36 @@
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+# dblib.properties
+org.openecomp.sdnc.sli.dbtype=jdbc
+
+org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01
+org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl
+org.openecomp.sdnc.sli.jdbc.database=sdnctl
+org.openecomp.sdnc.sli.jdbc.user=sdnctl
+org.openecomp.sdnc.sli.jdbc.password=gamma
+org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01
+org.openecomp.sdnc.sli.jdbc.connection.timeout=50
+org.openecomp.sdnc.sli.jdbc.request.timeout=100
+org.openecomp.sdnc.sli.jdbc.limit.init=10
+org.openecomp.sdnc.sli.jdbc.limit.min=10
+org.openecomp.sdnc.sli.jdbc.limit.max=20
+org.openecomp.dblib.connection.recovery=false
+