From: rui hu <hu.rui2@zte.com.cn>
Date: Mon, 11 Sep 2017 09:34:15 +0000 (+0000)
Subject: Merge "Use domain name instead of IP for discovery"
X-Git-Tag: 2.0.0-ONAP~671
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8182ba93519a1466951fc0f980322391c50b2108;hp=40dd61b03e4e1b154f2a7880963878adf9b365af;p=oom.git

Merge "Use domain name instead of IP for discovery"
---

diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash
index 636d86fcfd..7b8e2f8886 100755
--- a/kubernetes/oneclick/createAll.bash
+++ b/kubernetes/oneclick/createAll.bash
@@ -8,6 +8,8 @@ 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:
@@ -25,21 +27,26 @@ create_registry_key() {
 }
 
 create_onap_helm() {
-  helm install ../$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3
+  HELM_VALUES_ADDITION=""
+  if [[ ! -z $HELM_VALUES_FILEPATH ]]; then
+    HELM_VALUES_ADDITION="--values=$HELM_VALUES_FILEPATH"
+  fi
+  helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3 ${HELM_VALUES_ADDITION}
 }
 
 
 #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
+while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do
   case $PARAM in
     u)
       usage
@@ -48,9 +55,15 @@ 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)
       APP=${OPTARG}
       if [[ -z $APP ]]; then
@@ -100,7 +113,7 @@ 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