summaryrefslogtreecommitdiffstats
path: root/odlsli/src
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-06-22 17:05:16 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-06-22 17:05:16 -0400
commite14a02086c9119532f9153c78346d5c1d6789ca9 (patch)
tree05b612b7b008fc947dc2a11e315df70b1d045afd /odlsli/src
parent6f0c0101dcb421c75a1a49bea02d1dc7479ef7d1 (diff)
Improve odlsli startup time
Improved odlsli startup time by moving feature installation to build time, using ansible-opendaylight. Change-Id: I3f846da70e9aa0b8ce818ff83811c1b52aef1436 Issue-ID: CCSDK-285 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'odlsli/src')
-rw-r--r--odlsli/src/main/docker/Dockerfile41
-rw-r--r--odlsli/src/main/resources/install_ccsdk.yml15
-rw-r--r--odlsli/src/main/scripts/installCcsdkFeatures.sh103
-rw-r--r--odlsli/src/main/scripts/installFeatures.sh26
-rw-r--r--odlsli/src/main/scripts/installZips.sh121
-rw-r--r--odlsli/src/main/scripts/startODL.sh18
6 files changed, 54 insertions, 270 deletions
diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile
index f6aeda6d..4d4d3737 100644
--- a/odlsli/src/main/docker/Dockerfile
+++ b/odlsli/src/main/docker/Dockerfile
@@ -1,17 +1,46 @@
# Base ubuntu with added packages needed for open ecomp
FROM onap/ccsdk-odl-oxygen-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
+ENV ODL_HOME /opt/opendaylight
ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties
-
+ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features
+ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features
+ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features
+ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features
# copy the opendaylight credentials
-COPY idmlight.db.mv.db /opt/opendaylight/current
+COPY idmlight.db.mv.db $ODL_HOME/data
+
+
+# copy CCSDK mvn artifacts to ODL repository
+COPY system /tmp/system
+RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
+
+# Add CCSDK repositories to boot repositories
+RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
+RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+# Create odl user
+RUN useradd odl
+
+# Install ansible-opendaylight
+RUN apt install -y software-properties-common && \
+ apt-add-repository -y ppa:ansible/ansible && \
+ apt update && \
+ apt install -y ansible && \
+ ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight
+
+# Copy ccsdk install playbook
+COPY install_ccsdk.yml /tmp
+
+# Install features in ODL
+RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml
+
# copy deliverables to opt
COPY opt /opt
+COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg
-COPY org.ops4j.pax.logging.cfg /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
-# ENTRYPOINT exec /opt/opendaylight/current/bin/karaf
+ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh
EXPOSE 8181
diff --git a/odlsli/src/main/resources/install_ccsdk.yml b/odlsli/src/main/resources/install_ccsdk.yml
new file mode 100644
index 00000000..c478bfea
--- /dev/null
+++ b/odlsli/src/main/resources/install_ccsdk.yml
@@ -0,0 +1,15 @@
+---
+- hosts: all
+ become: yes
+ roles:
+ - role: ansible-opendaylight
+ # ODL is already installed, so no need to specify installation method. Specify extra features to install
+ extra_features:
+ - odl-restconf-all
+ - odl-mdsal-all
+ - odl-mdsal-apidocs
+ - odl-daexim-all
+ - ccsdk-sli-core-all
+ - ccsdk-sli-adaptors-all
+ - ccsdk-sli-northbound-all
+ - ccsdk-sli-plugins-all \ No newline at end of file
diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh
deleted file mode 100644
index 0b386306..00000000
--- a/odlsli/src/main/scripts/installCcsdkFeatures.sh
+++ /dev/null
@@ -1,103 +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=========================================================
-###
-
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features}
-
-CCSDK_CORE_FEATURES=" \
- slicore-utils \
- dblib \
- sli \
- filters \
- sliPluginUtils \
- sliapi"
-
-CCSDK_ADAPTORS_FEATURES=" \
- aai-service \
- mdsal-resource \
- resource-assignment \
- sql-resource"
-
-CCSDK_NORTHBOUND_FEATURES=" \
- asdcApi \
- dataChange"
-
-CCSDK_PLUGINS_FEATURES=" \
- properties-node \
- restapi-call-node"
-
-
-CCSDK_CORE_VERSION=${CCSDK_CORE_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_ADAPTORS_VERSION=${CCSDK_ADAPTORS_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT}
-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 odl-daexim-all
-
-echo "Installing CCSDK sli/core"
-for feature in ${CCSDK_CORE_FEATURES}
-do
- if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
- then
- ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
- else
- echo "No installer found for feature ccsdk-${feature}"
- fi
-done
-
-echo "Installing CCSDK sli/adaptors"
-for feature in ${CCSDK_ADAPTORS_FEATURES}
-do
- if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
- then
- ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
- else
- echo "No installer found for feature ccsdk-${feature}"
- fi
-done
-
-echo "Installing CCSDK sli/northbound"
-for feature in ${CCSDK_NORTHBOUND_FEATURES}
-do
- if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
- then
- ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
- else
- echo "No installer found for feature ccsdk-${feature}"
- fi
-done
-
-
-echo "Installing CCSDK sli/plugins"
-for feature in ${CCSDK_PLUGINS_FEATURES}
-do
- if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ]
- then
- ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
- else
- echo "No installer found for feature ccsdk-${feature}"
- fi
-done
diff --git a/odlsli/src/main/scripts/installFeatures.sh b/odlsli/src/main/scripts/installFeatures.sh
deleted file mode 100644
index e6b35bdd..00000000
--- a/odlsli/src/main/scripts/installFeatures.sh
+++ /dev/null
@@ -1,26 +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}
-
-${CCSDK_HOME}/bin/installCcsdkFeatures.sh \ No newline at end of file
diff --git a/odlsli/src/main/scripts/installZips.sh b/odlsli/src/main/scripts/installZips.sh
deleted file mode 100644
index f3d296a2..00000000
--- a/odlsli/src/main/scripts/installZips.sh
+++ /dev/null
@@ -1,121 +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=========================================================
-###
-
-if [ -z "$SETTINGS_FILE" -a -z "$GLOBAL_SETTINGS_FILE" -a -s "$HOME"/.m2/settings.xml ]
-then
- DEFAULT_MAVEN_SETTINGS=${HOME}/.m2/settings.xml
- SETTINGS_FILE=${SETTINGS_FILE:-${DEFAULT_MAVEN_SETTINGS}}
- GLOBAL_SETTINGS_FILE=${GLOBAL_SETTINGS_FILE:-${DEFAULT_MAVEN_SETTINGS}}
-fi
-
-CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-
-targetDir=${1:-${CCSDK_HOME}}
-featureDir=${targetDir}/features
-
-CCSDK_CORE_FEATURES=" \
- utils \
- dblib \
- filters \
- sli \
- sliPluginUtils \
- sliapi"
-
-CCSDK_ADAPTORS_FEATURES=" \
- aai-service \
- mdsal-resource \
- resource-assignment \
- sql-resource"
-
-CCSDK_NORTHBOUND_FEATURES=" \
- asdcApi \
- dataChange "
-
-CCSDK_PLUGINS_FEATURES=" \
- properties-node \
- restapi-call-node"
-
-CCSDK_CORE_VERSION=${CCSDK_CORE_VERSION:-0.2.1-SNAPSHOT}
-CCSDK_ADAPTORS_VERSION=${CCSDK_ADAPTORS_VERSION:-0.2.1-SNAPSHOT}
-CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.2.1-SNAPSHOT}
-CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.2.1-SNAPSHOT}
-
-if [ ! -d ${targetDir} ]
-then
- mkdir -p ${targetDir}
-fi
-
-if [ ! -d ${featureDir} ]
-then
- mkdir -p ${featureDir}
-fi
-
-cwd=$(pwd)
-
-mavenOpts=${2:-"-s ${SETTINGS_FILE} -gs ${GLOBAL_SETTINGS_FILE}"}
-cd /tmp
-
-echo "Installing CCSDK sli/core version ${CCSDK_CORE_VERSION}"
-for feature in ${CCSDK_CORE_FEATURES}
-do
- rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.core:${feature}-installer:${CCSDK_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
- unzip -d ${featureDir} /tmp/${feature}-installer*zip
-done
-
-echo "Installing CCSDK sli/adaptors version ${CCSDK_ADAPTORS_VERSION}"
-for feature in ${CCSDK_ADAPTORS_FEATURES}
-do
- rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.adaptors:${feature}-installer:${CCSDK_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
- unzip -d ${featureDir} /tmp/${feature}-installer*zip
-done
-
-echo "Installing CCSDK sli/northbound version ${CCSDK_NORTHBOUND_VERSION}"
-for feature in ${CCSDK_NORTHBOUND_FEATURES}
-do
- rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.northbound:${feature}-installer:${CCSDK_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
- unzip -d ${featureDir} /tmp/${feature}-installer*zip
-done
-
-
-echo "Installing CCSDK sli/plugins version ${CCSDK_PLUGINS_VERSION}"
-for feature in ${CCSDK_PLUGINS_FEATURES}
-do
- rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.plugins:${feature}-installer:${CCSDK_PLUGINS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
- unzip -d ${featureDir} /tmp/${feature}-installer*zip
-done
-
-
-
-echo "Installing CCSDK platform-logic"
-rm -f /tmp/platform-logic-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.distribution:platform-logic-installer:${CCSDK_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
-unzip -d ${targetDir} /tmp/platform-logic-installer*.zip
-
-find ${targetDir} -name '*.sh' -exec chmod +x '{}' \;
-
-cd $cwd
-
diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 6b42937c..8c45dda5 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -24,7 +24,7 @@
# Install SDN-C platform components if not already installed and start container
-ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+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}
@@ -46,24 +46,14 @@ if [ ! -f ${CCSDK_HOME}/.installed ]
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}
- echo "Installing SDN-C platform features"
- ${CCSDK_HOME}/bin/installFeatures.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 "Restarting OpenDaylight"
- ${ODL_HOME}/bin/stop
- echo "Waiting 60 seconds for OpenDaylight stop to complete"
- sleep 60
echo "Installed at `date`" > ${CCSDK_HOME}/.installed
fi
-exec ${ODL_HOME}/bin/karaf
+exec ${ODL_HOME}/bin/karaf server