diff options
author | Michael Dürre <michael.duerre@highstreet-technologies.com> | 2020-09-01 13:04:25 +0200 |
---|---|---|
committer | Michael Dürre <michael.duerre@highstreet-technologies.com> | 2020-09-01 13:46:17 +0000 |
commit | 1a75e4824ab39c493f405d8791dc62999b273f94 (patch) | |
tree | 7d25d807f4393c7e5b91023f82669be439cd8fa8 /odlsli/odlsli-alpine/src/main/scripts | |
parent | daa8ee351d6743396e2024872a5d49cc328f4c9b (diff) |
fix odlsli image for new base image
fix odlsli image and remove unused files
Issue-ID: CCSDK-2717
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I7dac1412426d19663bd91ba5cf7f23d24da69b3f
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'odlsli/odlsli-alpine/src/main/scripts')
-rw-r--r-- | odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh | 29 | ||||
-rw-r--r-- | odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh | 45 | ||||
-rw-r--r-- | odlsli/odlsli-alpine/src/main/scripts/startODL.sh | 65 |
3 files changed, 0 insertions, 139 deletions
diff --git a/odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh b/odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh deleted file mode 100644 index 603a3b4a..00000000 --- a/odlsli/odlsli-alpine/src/main/scripts/installOdlHostKey.sh +++ /dev/null @@ -1,29 +0,0 @@ -### -# ============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/odlsli-alpine/src/main/scripts/installSdncDb.sh b/odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh deleted file mode 100644 index efd7fe02..00000000 --- a/odlsli/odlsli-alpine/src/main/scripts/installSdncDb.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 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========================================================= -### - -CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} - -SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} -SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma} -SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl} - - -# Create tablespace and user account -mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql <<-END -CREATE DATABASE ${SDNC_DB_DATABASE}; -CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}'; -CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}'; -GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION; -commit; -END - -if [ -f ${CCSDK_HOME}/data/odlsli.dump ] -then -mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump -fi diff --git a/odlsli/odlsli-alpine/src/main/scripts/startODL.sh b/odlsli/odlsli-alpine/src/main/scripts/startODL.sh deleted file mode 100644 index 4d608577..00000000 --- a/odlsli/odlsli-alpine/src/main/scripts/startODL.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 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========================================================= -### - - -# Install SDN-C platform components if not already installed and start container - -ODL_HOME=${ODL_HOME:-/opt/opendaylight} -ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} -CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -SLEEP_TIME=${SLEEP_TIME:-120} -MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} -INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} - - -# -# Wait for database -# -echo "Waiting for mysql" -until mysql -h dbhost -u root -p${MYSQL_PASSWD} mysql &> /dev/null -do - printf "." - sleep 1 -done -echo -e "\nmysql ready" - -if [ ! -d ${INSTALLED_DIR} ] -then - mkdir -p ${INSTALLED_DIR} -fi - -if [ ! -f ${INSTALLED_DIR}/.installed ] -then - echo "Installing SDN-C database" - ${CCSDK_HOME}/bin/installSdncDb.sh - # echo "Installing OpenDaylight host key" - # ${CCSDK_HOME}/bin/installOdlHostKey.sh - if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ] - then - echo "Installing directed graphs" - ${CCSDK_HOME}/svclogic/bin/install.sh - fi - echo "Installed at `date`" > ${INSTALLED_DIR}/.installed -fi - -exec ${ODL_HOME}/bin/karaf server |