aboutsummaryrefslogtreecommitdiffstats
path: root/vnftools
diff options
context:
space:
mode:
authorDavid Stilwell <stilwelld@att.com>2018-04-18 18:02:19 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-18 18:02:19 +0000
commitc041f724712c74731e77dd8945563227a6e266cf (patch)
tree7a8e628ee6fb2ad8f73dedf6d3cf6a65582a25e9 /vnftools
parent69292cfed842cb54f318da75a5639396a44f686a (diff)
parent17ca41a3a2ba51a48fefa927c55f732da582d8d5 (diff)
Merge "Fix feature install for vnfapi"v1.3.1
Diffstat (limited to 'vnftools')
-rw-r--r--vnftools/installer/src/main/resources/scripts/install-feature.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/vnftools/installer/src/main/resources/scripts/install-feature.sh b/vnftools/installer/src/main/resources/scripts/install-feature.sh
index 6e8620e1..d5f620f1 100644
--- a/vnftools/installer/src/main/resources/scripts/install-feature.sh
+++ b/vnftools/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}