Add env needed by installCerts.py to docker-compose.yml

Add env variables needed by installCerts.py script to the
docker-compose.yml.

Change-Id: I3a61f67c2fbaf7e59aa4b35ec8d80040c2c5b85f
Issue-ID: SDNC-1131
Signed-off-by: Dan Timoney <dtimoney@att.com>
(cherry picked from commit 0f6ba0437e778d921c77726c15701adad8f728d9 [formerly 964dcf86d84ad9d06b1034dab627ab1b6de014b3])

Former-commit-id: 5ada540efbe7a804ec6b8b56be9a93e06bf2de92

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index e043bc0..4738851 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -173,6 +173,9 @@ fi
 cp /opt/opendaylight/current/certs/* /tmp
 cp -r /opt/app/osaaf/local/. /tmp
 
+# Create ODL data log directory (it nornally is created after karaf
+# is started, but needs to exist before installCerts.py runs)
+mkdir -p /opt/opendaylight/data/log
 nohup python ${SDNC_BIN}/installCerts.py &
 
 exec ${ODL_HOME}/bin/karaf server

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 4e0de9b..773d061 100644 (file)
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -59,6 +59,10 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/tmp
+      - ODL_ADMIN_USERNAME=admin
+      - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     dns:
       - ${DNS_IP_ADDR-10.0.100.1}
     logging: