Synching robot up with Beijing code

-updating configmaps with master
-parameterizing auth
-removing asdc interface fork.  no longer needed as be/fe are split
-fixing spaces
-aligning with templates better
-adding comments to values that need overriding per environment
-injecting demo project into container in /share/heat on startup

-addressing comment on demo-k8s.sh

Issue-ID: OOM-795

Change-Id: Iebc959c20491e3e2ca8cf64f22444918650d1970
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>

1 files changed, 17 insertions, 13 deletions

diff --git a/demo-k8s.sh b/demo-k8s.sh
index 23fc555..d5e7a03 100755
--- a/demo-k8s.sh
+++ b/demo-k8s.sh
@@ -22,7 +22,7 @@ function usage
 	echo "       demo.sh <namespace> appc <module_name>"
     echo "               - provide APPC with vFW module mount point for closed loop"
 	echo " "
-	echo "       demo.sh <namespace> init_robot"
+	echo "       demo.sh <namespace> init_robot [ <etc_hosts_prefix> ]"
     echo "               - Initialize robot after all ONAP VMs have started"
 	echo " "
 	echo "       demo.sh <namespace> instantiateVFW"
@@ -36,7 +36,7 @@ function usage
 }
 
 # Set the defaults
-if [ $# -le 1 ];then
+if [ $# -le 2 ];then
 	usage
 	exit
 fi
@@ -47,9 +47,9 @@ shift
 ##
 ## if more than 1 tag is supplied, the must be provided with -i or -e
 ##
-while [ $# -gt 0 ]
+while [ $# -gt 1 ]
 do
-	key="$1"
+	key="$2"
 
 	case $key in
     	init_robot)
@@ -62,6 +62,10 @@ do
 			fi
 			VARIABLES="$VARIABLES -v WEB_PASSWORD:$WEB_PASSWORD"
 			shift
+			if [ $# -eq 2 ];then
+				VARIABLES="$VARIABLES -v HOSTS_PREFIX:$2"
+			fi
+			shift
 			;;
     	init)
 			TAG="InitDemo"
@@ -75,7 +79,7 @@ do
 			TAG="InitDistribution"
 			shift
 			if [ $# -eq 1 ];then
-				VARIABLES="$VARIABLES -v DEMO_PREFIX:$1"
+				VARIABLES="$VARIABLES -v DEMO_PREFIX:$2"
 			fi
 			shift
 			;;
@@ -86,9 +90,9 @@ do
 				echo "Usage: demo.sh preload <vnf_name> <module_name>"
 				exit
 			fi
-			VARIABLES="$VARIABLES -v VNF_NAME:$1"
+			VARIABLES="$VARIABLES -v VNF_NAME:$2"
 			shift
-			VARIABLES="$VARIABLES -v MODULE_NAME:$1"
+			VARIABLES="$VARIABLES -v MODULE_NAME:$2"
 			shift
 			;;
     	appc)
@@ -98,7 +102,7 @@ do
 			echo "Usage: demo.sh appc <module_name>"
 			exit
 		fi
-    	VARIABLES="$VARIABLES -v MODULE_NAME:$1"
+    	VARIABLES="$VARIABLES -v MODULE_NAME:$2"
     	shift
     	;;
     	instantiateVFW)
@@ -113,14 +117,14 @@ do
 				echo "Usage: demo.sh deleteVNF <module_name from instantiateVFW>"
 				exit
 			fi
-			VARFILE=$1.py
+			VARFILE=$2.py
 			if [ -e /opt/eteshare/${VARFILE} ]; then
 				VARIABLES="$VARIABLES -V /share/${VARFILE}"
 			else
 				echo "Cache file ${VARFILE} is not found"
 				exit
 			fi
-      shift
+			shift
 			;;
     	heatbridge)
 			TAG="heatbridge"
@@ -129,11 +133,11 @@ do
 				echo "Usage: demo.sh heatbridge <stack_name> <service_instance_id> <service>"
 				exit
 			fi
-			VARIABLES="$VARIABLES -v HB_STACK:$1"
+			VARIABLES="$VARIABLES -v HB_STACK:$2"
 			shift
-			VARIABLES="$VARIABLES -v HB_SERVICE_INSTANCE_ID:$1"
+			VARIABLES="$VARIABLES -v HB_SERVICE_INSTANCE_ID:$2"
 			shift
-			VARIABLES="$VARIABLES -v HB_SERVICE:$1"
+			VARIABLES="$VARIABLES -v HB_SERVICE:$2"
 			shift
 			;;
     	*)