X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foneclick%2FcreateAll.bash;h=ded7c392ed1866e5c3efd9d1d12c99f48e359a94;hb=55434ccf2b0bd1629e80368595189d1513c87dfc;hp=afe71af8e1a856f6e05d35fba012d13f2021c4e6;hpb=3e130463a0062cdb7aef9717c46ee5bc9958a32e;p=oom.git

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index afe71af8e1..ded7c392ed 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -13,8 +13,8 @@ Usage: $0 [PARAMs]
 -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, multicloud, clamp, consul
+                      sdc, aai ,mso, message-router, robot, vid, aaf, uui
+                      sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
 EOF
 }
 
@@ -26,15 +26,41 @@ check_return_code(){
   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() {
-  cmd=`echo kubectl create namespace $1-$2`
+  cmd=`echo kubectl create namespace $1`
   eval ${cmd}
-  check_return_code $cmd
 }
 
 create_registry_key() {
-  cmd=`echo 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
+}
+
+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
 }
@@ -44,6 +70,19 @@ create_onap_helm() {
   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
@@ -60,6 +99,8 @@ MAX_INSTANCE=5
 DU=$ONAP_DOCKER_USER
 DP=$ONAP_DOCKER_PASS
 
+SINGLE_COMPONENT=false
+
 while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
   case $PARAM in
     u)
@@ -79,6 +120,7 @@ while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
       LOCATION=${OPTARG}
       ;;
     a)
+      SINGLE_COMPONENT=true
       APP=${OPTARG}
       if [[ -z $APP ]]; then
         usage
@@ -122,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