X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foneclick%2FcreateAll.bash;h=ded7c392ed1866e5c3efd9d1d12c99f48e359a94;hb=9e5067c36e6133e782c5c274d7bc218437e50ce8;hp=e408d674774f4b23557a5f10c33ecb64493e1028;hpb=78eff21978e9252c1128ff2f4820d43a08b2b0a7;p=oom.git

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index e408d67477..ded7c392ed 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -8,38 +8,100 @@ usage() {
 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
+                      sdc, aai ,mso, message-router, robot, vid, aaf, uui
+                      sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
 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_service_account() {
+  cmd=`echo kubectl create clusterrolebinding $1-admin-binding --clusterrole=cluster-admin --serviceaccount=$1:default`
+  eval ${cmd}
+  check_return_code $cmd
+}
+
 create_namespace() {
-  kubectl create namespace $1-$2
+  cmd=`echo kubectl create namespace $1`
+  eval ${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 create secret docker-registry $2 --docker-server=$3 --docker-username=$4 --docker-password=$5 --docker-email=$6`
+  eval ${cmd}
+  check_return_code $cmd
 }
 
-create_onap_helm() {
-  helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1 --set nodePortPrefix=$3
+configure_dcaegen2() {
+  if [ ! -s "$OPENSTACK_PRIVATE_KEY_PATH" ]
+  then
+    echo "ERROR: $OPENSTACK_PRIVATE_KEY_PATH does not exist or is empty.  Cannot launch dcae gen2."
+    return 1
+  fi
+
+  cmd=`echo kubectl --namespace $1-$2 create secret generic $2-openstack-ssh-private-key --from-file=key=${OPENSTACK_PRIVATE_KEY_PATH}`
+  eval ${cmd}
+  check_return_code $cmd
+
+  if [ ! -s "$DCAEGEN2_CONFIG_INPUT_FILE_PATH" ]
+  then
+    echo "ERROR: $DCAEGEN2_CONFIG_INPUT_FILE_PATH does not exist or is empty.  Cannot launch dcae gen2."
+    return 1
+  fi
+
+  cmd=`echo kubectl --namespace $1-$2 create configmap $2-config-inputs --from-file=inputs.yaml=${DCAEGEN2_CONFIG_INPUT_FILE_PATH}`
+  eval ${cmd}
+  check_return_code $cmd
 }
 
+create_onap_helm() {
+  HELM_VALUES_ADDITION=""
+  if [[ ! -z $HELM_VALUES_FILEPATH ]]; then
+    HELM_VALUES_ADDITION="--values=$HELM_VALUES_FILEPATH"
+  fi
+  # Have to put a check for dcaegen2 because it requires external files to helm
+  # which should not be part of the Chart.
+  if [ "$2" = "dcaegen2" ];
+  then
+    configure_dcaegen2 $1 $2
+    local result=$?
+    if [ $result -ne 0 ]
+    then
+      echo "ERROR: dcaegen2 failed to configure: Pre-requisites not met.  Skipping deploying it and continue"
+      return
+    fi
+  fi
+
+  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=""
+LOCATION="../"
 INCL_SVC=true
 APP=
 INSTANCE=1
 MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
-_FILES_PATH=$(echo ../$i/templates)
 
-while getopts ":n:u:s:i:a:du:dp:" PARAM; do
+SINGLE_COMPONENT=false
+
+while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
   case $PARAM in
     u)
       usage
@@ -48,10 +110,17 @@ while getopts ":n:u:s:i:a:du:dp:" PARAM; do
     n)
       NS=${OPTARG}
       ;;
+    v)
+      HELM_VALUES_FILEPATH=${OPTARG}
+      ;;
     i)
       INSTANCE=${OPTARG}
       ;;
+    l)
+      LOCATION=${OPTARG}
+      ;;
     a)
+      SINGLE_COMPONENT=true
       APP=${OPTARG}
       if [[ -z $APP ]]; then
         usage
@@ -95,15 +164,21 @@ printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${sta
 
 printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n"
 
+if [ "$SINGLE_COMPONENT" == "false" ]
+then
+    printf "\nCreating namespace **********\n"
+    create_namespace $NS
+
+    printf "\nCreating registry secret **********\n"
+    create_registry_key $NS ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
+
+    printf "\nCreating service account **********\n"
+    create_service_account $NS
+fi
 
 printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n"
 
 for i in ${HELM_APPS[@]}; do
-  printf "\nCreating namespace **********\n"
-  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