Merge "Fix Nexus and Chartmuseum install scripts"

diff --git a/ric-infra/10-Nexus/bin/install b/ric-infra/10-Nexus/bin/install
index f1ca83a..cacb3a9 100755 (executable)
--- 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 f1a3bb8..ae097fe 100755 (executable)
--- 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