summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-07-02 14:14:04 +0200
committerhighstreetherbert <herbert.eiselt@highstreet-technologies.com>2021-07-02 14:14:36 +0200
commit7af41819f26441ec614229028b38ca856586cc6b (patch)
treea9bce1ee122446990ae254eb7dc7b75601d86566
parent860f02ed19ec3dd8e0fa7323c4d8f147eafb4e95 (diff)
ODLUX Encoding issues and Missing log output
Issue-ID: SDNC-1580 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Change-Id: If452c24fa6b8d1ae47d9c612b1d7007312acbd47 Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com> Former-commit-id: e2c1610e79fb3688e34a3fc9044aba2029bf15a6
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile1
-rwxr-xr-xinstallation/sdnc/src/main/scripts/startODL.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index cdb6c896..91612d31 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -80,6 +80,7 @@ FROM scratch
LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
USER root
+ENV LC_ALL en_US.UTF-8
ENV JAVA_HOME /opt/java/openjdk
ENV PATH $PATH:/opt/java/openjdk/bin
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index a0acc311..61657944 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -215,6 +215,7 @@ enable_odl_cluster() {
printf "Installing SDNC/R from startODL.sh script\n"
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_FEATURES_BOOT_FILE=$ODL_HOME/etc/org.apache.karaf.features.cfg
+FEATURESBOOTMARKER="featuresBoot *="
ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}