summaryrefslogtreecommitdiffstats
path: root/vnfapi/installer
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-04-18 11:30:14 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-04-18 11:30:14 -0400
commit17ca41a3a2ba51a48fefa927c55f732da582d8d5 (patch)
tree6332db9b29f0e0880114a150871ce94ebb8d6ce3 /vnfapi/installer
parent131f1fab6bea5eeb6467e8836ec00ef7c6bf5eac (diff)
Fix feature install for vnfapi
Fixed feature installer for vnfapi and vnftools to use client without -u option. Change-Id: Ic9b152965a6e70577d6e787f1e3b0a26852fcf54 Issue-ID: SDNC-283 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Diffstat (limited to 'vnfapi/installer')
-rw-r--r--vnfapi/installer/src/main/resources/scripts/install-feature.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/vnfapi/installer/src/main/resources/scripts/install-feature.sh b/vnfapi/installer/src/main/resources/scripts/install-feature.sh
index 6e8620e1..d5f620f1 100644
--- a/vnfapi/installer/src/main/resources/scripts/install-feature.sh
+++ b/vnfapi/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}