diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-13 16:09:17 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-13 16:09:17 -0400 |
| commit | 67c756046e620cb8017bbe87a8e07588fab45ecd (patch) | |
| tree | 4ac4abd81b37ea92eb545464e46c097f5f417d53 /odlsli/src | |
| parent | f52fd84595277a11c27f335ff88e967889528f99 (diff) | |
Install host key
Create a new script to install karaf host.key on ODL installation.
Also, updated base ODL container to move ODL base distribution
directory to /opt/opendaylight/current and create a symlink with
the original name. This is done to allow OOM to support an external
mount to /opt/opendaylight/current/daexim to preserve backups.
Change-Id: I048b7d8002636dcd4ffbdff7242eb40d2a2787da
Issue-ID: CCSDK-241
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'odlsli/src')
| -rw-r--r-- | odlsli/src/main/scripts/installCcsdkFeatures.sh | 8 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/installOdlHostKey.sh | 29 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 1 |
3 files changed, 30 insertions, 8 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} |