summaryrefslogtreecommitdiffstats
path: root/asdcApi/installer/src
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2018-02-22 17:22:31 -0600
committerDan Timoney <dtimoney@att.com>2018-02-26 11:28:52 -0500
commit10b6a72f544dd1331e9dba53e77c61deaafbd19f (patch)
tree4fbbe1a3d24c35793ad61c3b26fe1b532bda2322 /asdcApi/installer/src
parent0b8794f5ef4c0d4bdd6fff4d8bb83bfebc6f8744 (diff)
Nitrogen port: sli/northbound
Update sli/northbound to compile for ODL Nitrogen Change-Id: Ib14fea5dd3922175bd183afb9f3c85edaa7a2f0c Issue-ID: CCSDK-177 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'asdcApi/installer/src')
-rw-r--r--asdcApi/installer/src/main/resources/scripts/install-feature.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/asdcApi/installer/src/main/resources/scripts/install-feature.sh b/asdcApi/installer/src/main/resources/scripts/install-feature.sh
index e986764b9..cee4a4952 100644
--- a/asdcApi/installer/src/main/resources/scripts/install-feature.sh
+++ b/asdcApi/installer/src/main/resources/scripts/install-feature.sh
@@ -10,9 +10,9 @@
# 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.
@@ -23,7 +23,6 @@
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"}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,5 +35,5 @@ else
exit 1
fi
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} feature:install ${features.boot}