Merge "Install host key"

4 files changed, 33 insertions, 11 deletions

diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh
index 4ee03e39..e4bbe65d 100644
--- a/odlsli/src/main/scripts/installCcsdkFeatures.sh
+++ b/odlsli/src/main/scripts/installCcsdkFeatures.sh
@@ -57,14 +57,6 @@ CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.0.1-SNAPSHOT}
 echo "Enabling core features"
 ${ODL_HOME}/bin/client feature:install odl-restconf-all odl-mdsal-all odl-mdsal-apidocs
 
-# Remove etc/host.key if it exists to work around
-# issue with client authentication
-if [ -f ${ODL_HOME}/etc/host.key ]
-then
-  rm ${ODL_HOME}/etc/host.key
-fi
-
-
 echo "Installing CCSDK sli/core"
 for feature in ${CCSDK_CORE_FEATURES}
 do
diff --git a/odlsli/src/main/scripts/installOdlHostKey.sh b/odlsli/src/main/scripts/installOdlHostKey.sh
new file mode 100644
index 00000000..603a3b4a
--- /dev/null
+++ b/odlsli/src/main/scripts/installOdlHostKey.sh
@@ -0,0 +1,29 @@
+###
+# ============LICENSE_START=======================================================
+# ONAP : CCSDK
+# ================================================================================
+# Copyright (C) 2018 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=========================================================
+###
+ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+if [ ! -f ${ODL_HOME}/etc/host.key ]
+then
+	echo "Installing karaf host key"
+	umask 022
+    mv ${ODL_HOME}/etc/org.apache.karaf.shell.cfg ${ODL_HOME}/etc/org.apache.karaf.shell.cfg.sav
+    cat ${ODL_HOME}/etc/org.apache.karaf.shell.cfg.sav | sed -e "s/hostKeyFormat = simple/hostKeyFormat = PEM/" > ${ODL_HOME}/etc/org.apache.karaf.shell.cfg
+    openssl genrsa -out /opt/opendaylight/current/etc/host.key 4096
+fi
\ No newline at end of file
diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index ad5c8bc6..6b42937c 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -47,6 +47,7 @@ then
     echo "Installing SDN-C database"
     ${CCSDK_HOME}/bin/installSdncDb.sh
     echo "Starting OpenDaylight"
+    ${CCSDK_HOME}/bin/installOdlHostKey.sh
     ${ODL_HOME}/bin/start
     echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
     sleep ${SLEEP_TIME}
diff --git a/opendaylight/nitrogen/src/main/docker/Dockerfile b/opendaylight/nitrogen/src/main/docker/Dockerfile
index 1f69017c..f5c2324c 100644
--- a/opendaylight/nitrogen/src/main/docker/Dockerfile
+++ b/opendaylight/nitrogen/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 # Base ubuntu with added packages needed for open ecomp
 FROM onap/ccsdk-ubuntu-image:${project.version}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.openecomp.org)
+MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 ENV ODL_HOME /opt/opendaylight/current
 
@@ -9,8 +9,8 @@ COPY karaf-${ccsdk.opendaylight.version}.tar.gz /tmp/
 RUN mkdir /opt/opendaylight \
     && tar zxvf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz --directory /opt/opendaylight \
     && rm -rf /tmp/karaf-${ccsdk.opendaylight.version}.tar.gz \
-    && ln -s /opt/opendaylight/karaf-${ccsdk.opendaylight.version} /opt/opendaylight/current
-
+    && mv /opt/opendaylight/karaf-${ccsdk.opendaylight.version} /opt/opendaylight/current \
+    && ln -s  /opt/opendaylight/current /opt/opendaylight/karaf-${ccsdk.opendaylight.version}
 
 # workaround till we get proxy working
 RUN mkdir -p /opt/opendaylight/current/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}