From bfb86a07c72262855309b30b1399f3eaab8019c5 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 6 Apr 2020 11:56:37 -0400 Subject: [PATCH] Fix env variable names Correct variable names for ODL admin user and password Change-Id: I31a0a4d01305999fe7fab67acddc43e943bc1567 Issue-ID: SDNC-1131 Signed-off-by: Dan Timoney Former-commit-id: 655b551fad9188eeca75ed59bf7aa2a7325a52ca --- installation/sdnc/src/main/scripts/startODL.sh | 3 +++ installation/src/main/yaml/docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index e043bc04..47388512 100755 --- 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 54d3cbbf..773d0616 100644 --- 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} -- 2.16.6