From 67a8111887a180c20105ced4c16ee082f7b8cea7 Mon Sep 17 00:00:00 2001
From: tzvika avni <tzvikaa@amdocs.com>
Date: Thu, 7 Sep 2017 19:43:57 +0300
Subject: [PATCH] deploy components from different path

Provide ability to deploy components in a different path via createAll.sh
Issue-ID: OOM-291

Change-Id: Ia5f0c5e16bf3f9edff6c457176b6f428603d9544
Signed-off-by: tzvika avni <tzvikaa@amdocs.com>
---
 kubernetes/oneclick/createAll.bash | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 8a27510e5c..7b8e2f8886 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -9,6 +9,7 @@ Usage: $0 [PARAMs]
 -u                  : Display usage
 -n [NAMESPACE]      : Kubernetes namespace (required)
 -v [VALUES]         : HELM values filepath (usefull when deploying one component at a time)
+-l [LOCATION]       : Location of oom project
 -i [INSTANCE]       : ONAP deployment instance # (default: 1)
 -a [APP]            : Specify a specific ONAP component (default: all)
                       from the following choices:
@@ -27,16 +28,17 @@ create_registry_key() {
 
 create_onap_helm() {
   HELM_VALUES_ADDITION=""
-  if [[ ! -z $4 ]]; then
-     HELM_VALUES_ADDITION="--values=$4"  
+  if [[ ! -z $HELM_VALUES_FILEPATH ]]; then
+    HELM_VALUES_ADDITION="--values=$HELM_VALUES_FILEPATH"
   fi
-  helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1 --set nodePortPrefix=$3 ${HELM_VALUES_ADDITION}
+  helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3 ${HELM_VALUES_ADDITION}
 }
 
 
 #MAINs
 NS=
-HELM_VALUES_FILEPATH=
+HELM_VALUES_FILEPATH=""
+LOCATION="../"
 INCL_SVC=true
 APP=
 INSTANCE=1
@@ -44,7 +46,7 @@ MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
 
-while getopts ":n:u:s:i:a:du:dp:v:" PARAM; do
+while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
   case $PARAM in
     u)
       usage
@@ -59,6 +61,9 @@ while getopts ":n:u:s:i:a:du:dp:v:" PARAM; do
     i)
       INSTANCE=${OPTARG}
       ;;
+    l)
+      LOCATION=${OPTARG}
+      ;;
     a)
       APP=${OPTARG}
       if [[ -z $APP ]]; then
@@ -108,13 +113,13 @@ printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n"
 
 for i in ${HELM_APPS[@]}; do
   printf "\nCreating namespace **********\n"
-  create_namespace $NS $i 
+  create_namespace $NS $i
 
   printf "\nCreating registry secret **********\n"
   create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
 
   printf "\nCreating deployments and services **********\n"
-  create_onap_helm $NS $i $start $HELM_VALUES_FILEPATH
+  create_onap_helm $NS $i $start
 
   printf "\n"
 done
-- 
2.16.6