diff options
| author |   Dan Timoney <dtimoney@att.com> | 2018-02-16 17:12:41 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2018-02-21 11:28:46 -0600 |
| commit | 8a3f1ea2bee98d30c74317fd31f83b6ea3ec4734 (patch) | |
| tree | a3cce3183f0ef2930ffdbd6982b346d31019327c /sql-resource/installer/src/main | |
| parent | 1dc3bcf1a5b3bcef0675df98c3592014c5f7b906 (diff) | |
Nitrogen port : mdsal/sql
Update mdsal-resource and sql-resource to support ODL Nitrogen
Change-Id: Id7f7ac2da0de9d034e052ee16ef9c2a765a056bf
Issue-ID: CCSDK-176
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'sql-resource/installer/src/main')
| -rw-r--r-- | sql-resource/installer/src/main/resources/scripts/install-feature.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql-resource/installer/src/main/resources/scripts/install-feature.sh b/sql-resource/installer/src/main/resources/scripts/install-feature.sh index e986764b..cee4a495 100644 --- a/sql-resource/installer/src/main/resources/scripts/install-feature.sh +++ b/sql-resource/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} |