diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-02-27 13:34:16 -0500 |
|---|---|---|
| committer |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-02-27 16:55:38 -0500 |
| commit | ad7ea1271a5eb1bb56b48a2fb1b35d8ddfed2d12 (patch) | |
| tree | c2f16f0cf6bb75bf9c36017bba7bb869cd195423 /restapi-call-node/installer/src/main/resources | |
| parent | e26d43acd63b27378b201400294d219c6fe8fb4d (diff) | |
Nitrogen port : sli/plugins
Update properties-node and restapi-call-node to compile against
ODL Nitrogen
Change-Id: I21f06abb008562d6e351cb780302ed4375f5d3d2
Issue-ID: CCSDK-178
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'restapi-call-node/installer/src/main/resources')
| -rw-r--r-- | restapi-call-node/installer/src/main/resources/scripts/install-feature.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh b/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh index e986764b..cee4a495 100644 --- a/restapi-call-node/installer/src/main/resources/scripts/install-feature.sh +++ b/restapi-call-node/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} |