Merge "Failure encountered while execution of installCerts.py script fails to convert...

Former-commit-id: 56ecc53aed85f4d0686e9a66f92d87ab11bbbebf

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 54d3cbb..773d061 100644 (file)
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -61,7 +61,7 @@ services:
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
       - SDNC_BIN=/opt/onap/sdnc/bin
       - ODL_CERT_DIR=/tmp
-      - ODL_ADMIN_USERNAMEadmin
+      - ODL_ADMIN_USERNAME=admin
       - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     dns:
       - ${DNS_IP_ADDR-10.0.100.1}