aboutsummaryrefslogtreecommitdiffstats
path: root/appc-outbound
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-01-18 12:28:08 -0800
committerPatrick Brady <patrick.brady@att.com>2019-01-18 21:14:19 +0000
commit763734c4d961b06b45f0de2d2247bd2c632c3176 (patch)
tree246ab2d58d6a1978a8f7a930b5bef759764d653a /appc-outbound
parentaa8878a2963b963ab9186fe7d8df235e366e41e2 (diff)
Update install-feature for pre-install
Since the feature zip files will be extracted during docker build, the install-features scripts need to be modified so that the script will not fail when the zip file does not exist, since the zip file will have already been unzipped. Change-Id: I441064226db956addae5c2f238114ce3965c13ef Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1337
Diffstat (limited to 'appc-outbound')
-rwxr-xr-xappc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh4
-rwxr-xr-xappc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh4
2 files changed, 2 insertions, 6 deletions
diff --git a/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh b/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh
index fff75e1c1..6402f6c32 100755
--- a/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh
@@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
if [ -f ${REPOZIP} ]
then
unzip -n -d ${ODL_HOME} ${REPOZIP}
-else
- echo "ERROR : repo zip ($REPOZIP) not found"
- exit 1
+
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
diff --git a/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh b/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh
index fff75e1c1..6402f6c32 100755
--- a/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh
@@ -33,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
if [ -f ${REPOZIP} ]
then
unzip -n -d ${ODL_HOME} ${REPOZIP}
-else
- echo "ERROR : repo zip ($REPOZIP) not found"
- exit 1
+
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}