summaryrefslogtreecommitdiffstats
path: root/generic-resource-api/installer/src
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-02-28 21:13:09 -0500
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-02-28 21:13:09 -0500
commit131f1fab6bea5eeb6467e8836ec00ef7c6bf5eac (patch)
tree6bab70fa7c38622c76a0384a9dd348daa80b1ab5 /generic-resource-api/installer/src
parent2db328c6cd234acdfc836c995876ef12a43dc7f5 (diff)
Nitrogen port : sdnc-northbound
Update sdnc/northbound to OpenDaylight Nitrogen release. Change-Id: I6e299418a7ab441899b78b5d3df5f8ee96829222 Issue-ID: SDNC-269 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'generic-resource-api/installer/src')
-rw-r--r--generic-resource-api/installer/src/main/resources/scripts/install-feature.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh b/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh
index 6e8620e1..d5f620f1 100644
--- a/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh
+++ b/generic-resource-api/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}