Revise deployment tools to better reflect the repo structure.

[it/dep.git] / bin / deploy-ric-aux

diff --git a/bin/deploy-ric-aux b/bin/deploy-ric-aux
index 8a4546f..d0ddeee 100755 (executable)
--- a/bin/deploy-ric-aux
+++ b/bin/deploy-ric-aux
@@ -18,33 +18,39 @@
 
 # This script deploys RIC aux components automatically
 
-OVERRIDEYAML=$1
+if [ "$#" -eq 1 ]; then
+    OVERRIDEYAML=$1
+else
 
-if [ -z "$OVERRIDEYAML" ];then
-echo "****************************************************************************************************************"
-echo "                                                     WARNING                                                    "
-echo "****************************************************************************************************************"
-echo "Deploying RIC auxiliary without deployment recipe. Default configurations are used."
-echo "****************************************************************************************************************"
+    while [ -n "$1" ]; do # while loop starts
 
-fi
+        case "$1" in
 
+        -f) OVERRIDEYAML=$2
+            shift
+            ;;
+        *) echo "Option $1 not recognized" ;; # In case you typed a different option other than a,b,c
 
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+        esac
+
+        shift
 
-source $ROOT_DIR/../etc/ric.conf
+    done
+fi
 
 
-export RICAUX_RELEASE_NAME=$helm_release_name
+if [ -z "$OVERRIDEYAML" ];then
+    echo "****************************************************************************************************************"
+    echo "                                                     ERROR                                                      "
+    echo "****************************************************************************************************************"
+    echo "RIC deployment without deployment recipe is currently disabled. Please specify an recipe with the -f option."
+    echo "****************************************************************************************************************"
+    exit 1
+fi
 
-export RICPLT_NAMESPACE=$plt_namespace
-export RICXAPP_NAMESPACE=$xapp_namespace
-export RICAUX_NAMESPACE=$aux_namespace
-export RICINFRA_NAMESPACE=$infra_namespace
 
-for component in $ROOT_DIR/../ric-aux/*/; do
-    # Will print */ if no directories are available
-    . $component/bin/install $OVERRIDEYAML
+ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-done
+$ROOT_DIR/prepare-common-templates
 
+$ROOT_DIR/../ric-aux/bin/install -f $OVERRIDEYAML