diff options
author | Patrick Brady <pb071s@att.com> | 2017-09-26 00:00:21 -0700 |
---|---|---|
committer | Patrick Brady <pb071s@att.com> | 2017-09-26 15:22:40 +0000 |
commit | 0f883fa07618b6e9d752edc30659d183fcbb73b1 (patch) | |
tree | c46361b2e4050a128c894de2c15f24112e59395b | |
parent | c7e7a5624521385e5702b53da155aef784b4542e (diff) |
Removing sdnc resource assignment from start
The sdnc resource assignment provider is failing to start,
plus it is a component that we are not using. This change
allows us to modify the sdnc start script so that component
does not start.
Change-Id: Ie48345aa7834393e08070dd6a022e7cc1a4cc5d8
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-id: CCSDK-102
-rw-r--r-- | installation/appc/pom.xml | 2 | ||||
-rw-r--r-- | installation/appc/src/main/resources/sdncInstallFeatures.sh | 101 | ||||
-rw-r--r-- | installation/appc/src/main/scripts/startODL.sh | 3 |
3 files changed, 106 insertions, 0 deletions
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml index cedded3..7ed693c 100644 --- a/installation/appc/pom.xml +++ b/installation/appc/pom.xml @@ -88,6 +88,7 @@ <directory>src/main/resources</directory> <includes> <include>*.dump</include> + <include>*.sh</include> </includes> <filtering>false</filtering> </resource> @@ -326,6 +327,7 @@ <directory>src/main/resources</directory> <includes> <include>*.dump</include> + <include>*.sh</include> </includes> <filtering>false</filtering> </resource> diff --git a/installation/appc/src/main/resources/sdncInstallFeatures.sh b/installation/appc/src/main/resources/sdncInstallFeatures.sh new file mode 100644 index 0000000..a119d57 --- /dev/null +++ b/installation/appc/src/main/resources/sdncInstallFeatures.sh @@ -0,0 +1,101 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# 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} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} + +SDNC_CORE_FEATURES=" \ + slicore-utils \ + dblib \ + filters \ + sli \ + sliPluginUtils \ + sliapi" + +SDNC_ADAPTORS_FEATURES=" \ + aai-service \ + mdsal-resource \ + sql-resource" + +SDNC_PLUGINS_FEATURES=" \ + properties-node \ + restapi-call-node" + + +SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT} +SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} +SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} +SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.1-SNAPSHOT} + +echo "Enabling core features" +${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-all +${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-apidocs +${ODL_HOME}/bin/client -u karaf feature:install odl-restconf-all + + + + +echo "Installing SDN-C core" +for feature in ${SDNC_CORE_FEATURES} +do + if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done + +echo "Installing SDN-C adaptors" +for feature in ${SDNC_ADAPTORS_FEATURES} +do + if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done + +echo "Installing SDN-C northbound" +for feature in ${SDNC_NORTHBOUND_FEATURES} +do + if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done + +echo "Installing SDN-C plugins" +for feature in ${SDNC_PLUGINS_FEATURES} +do + if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh index c97057c..658ace8 100644 --- a/installation/appc/src/main/scripts/startODL.sh +++ b/installation/appc/src/main/scripts/startODL.sh @@ -81,6 +81,9 @@ then ${ODL_HOME}/bin/start echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize" sleep ${SLEEP_TIME} + echo "Inserting modified installFeatures.sh for sdnc" + rm ${SDNC_HOME}/bin/installFeatures.sh + cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh echo "Installing SDN-C platform features" ${SDNC_HOME}/bin/installFeatures.sh if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] |