Add Consul support to 'OneClick' deployment.

[oom.git] / kubernetes / oneclick / createAll.bash

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 8a27510..afe71af 100755 (executable)
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -9,34 +9,50 @@ 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:
                       sdc, aai ,mso, message-router, robot,
-                      vid, sdnc, portal, policy, appc
+                      vid, sdnc, portal, policy, appc, multicloud, clamp, consul
 EOF
 }
 
+check_return_code(){
+  ret=$?
+  if [ $ret -ne 0 ]; then
+    printf "The command $1 returned with error code $ret \n" 1>&2
+    exit $ret
+  fi
+}
+
+
 create_namespace() {
-  kubectl create namespace $1-$2
+  cmd=`echo kubectl create namespace $1-$2`
+  eval ${cmd}
+  check_return_code $cmd
 }
 
 create_registry_key() {
-  kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7
+  cmd=`echo kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7`
+  eval ${cmd}
+  check_return_code $cmd
 }
 
 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}
+  cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3 ${HELM_VALUES_ADDITION}`
+  eval ${cmd}
+  check_return_code $cmd
 }
 
-
 #MAINs
 NS=
-HELM_VALUES_FILEPATH=
+HELM_VALUES_FILEPATH=""
+LOCATION="../"
 INCL_SVC=true
 APP=
 INSTANCE=1
@@ -44,7 +60,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 +75,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 +127,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