From: wrider <lji@research.att.com>
Date: Wed, 24 Jul 2019 20:50:26 +0000 (-0400)
Subject: Fix Nexus and Chartmuseum install scripts
X-Git-Tag: 0.0.2~51^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a032714587f6e95ab9c00867f6532d2799e66aea;p=it%2Fdep.git

Fix Nexus and Chartmuseum install scripts

Change-Id: I46921abe7c03d78f88ff412f7897802119631adb
Signed-off-by: wrider <lji@research.att.com>
---

diff --git a/ric-infra/10-Nexus/bin/install b/ric-infra/10-Nexus/bin/install
index f1ca83ab..cacb3a91 100755
--- a/ric-infra/10-Nexus/bin/install
+++ b/ric-infra/10-Nexus/bin/install
@@ -65,7 +65,7 @@ echo "Helm Release: $RELEASE_NAME"
 NODENAME=$(kubectl get node | awk 'NR==2{print $1}')
 kubectl label --overwrite nodes $NODENAME nexus-node=enable
 
-. ./clear_nexus_data_path
+. "$DIR/clear_nexus_data_path"
 
 
 
@@ -74,6 +74,8 @@ helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
 
 
 mkdir -p  $DIR/../helm/charts/
+mkdir -p /tmp/nexus3-data
+
 cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/
 
 if [ -z $OVERRIDEYAML ]; then
diff --git a/ric-infra/15-Chartmuseum/bin/install b/ric-infra/15-Chartmuseum/bin/install
index f1a3bb83..ae097fea 100755
--- a/ric-infra/15-Chartmuseum/bin/install
+++ b/ric-infra/15-Chartmuseum/bin/install
@@ -64,11 +64,12 @@ NODENAME=$(kubectl get node | awk 'NR==2{print $1}')
 kubectl label --overwrite nodes $NODENAME helm-node=enable
 
 DIRTEMP=$DIR
-. ./clear_data_path
+. "$DIR/clear_data_path"
 DIR=$DIRTEMP
 
 
 RICINFRA_COMPONENTS="chartmuseum"
+mkdir -p /tmp/chartmuseum-data
 
 echo "Deploying RIC infra components [$RICINFRA_COMPONENTS]"
 echo "Helm Release Name: $RELEASE_NAME"
@@ -79,11 +80,10 @@ helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common
 
 
 
-
-
 for component in $RICINFRA_COMPONENTS; do
 
   mkdir -p $DIR/../helm/$component/charts/
+
   cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/$component/charts/
 
   if [ -z $OVERRIDEYAML ]; then