From 5b81764739425ccb4a418947e1565a7f691f4204 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 22 Mar 2018 15:12:48 -0700 Subject: ODL Upgrade Method 2 Changes necessary to support upgrade to ODL Nitrogen, while continuing to use Karaf 3 style features Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d Signed-off-by: Patrick Brady Issue-ID: APPC-403 --- .../installer/src/main/resources/scripts/install-feature.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'appc-config/appc-data-services/installer/src') diff --git a/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh index d3d2ea6e7..69ca19451 100644 --- a/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP : APP-C # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-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. @@ -16,14 +16,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -# ECOMP is a trademark and service mark of AT&T Intellectual Property. ### #!/bin/bash ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} +ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -37,4 +36,4 @@ else fi ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} + -- cgit 1.2.3-korg