First implementation of automatic naming. TIMEOUT is now configurable. Refs. #71950

Author: charliefd

Dockerfile

@@ -10,7 +10,8 @@ ENV IMAGE_NAME=EEA-docker-generic-v2.2 \
     INSTANCE_DOCKERSTORAGE_TYPE=standard \
     INSTANCE_DOCKER_VOLUME=true \
     INSTANCE_DOCKER_VOLUME_TYPE=standard \
-    INSTANCE_DOCKER_VOLUME_SIZE=10 
+    INSTANCE_DOCKER_VOLUME_SIZE=10 \
+    TIMEOUT=40
 
 
 RUN set -e \

README.md

@@ -42,8 +42,12 @@ Create a VM named prodXX-mil using defaults
 * OS_VOLUME_API_VERSION - API version for cinder. Defaults to 1
 * OS_AVAILABILITY_ZONE  - openstack availability zone within the tenant (optional if the provider has only one zone or it uses same default for all services)
 
+* TIMEOUT		- how long shall we wait for volume or instance creation to succeed (in 10s of seconds)
+
 * IMAGE_NAME                  - glance image to be used. defaults to EEA-docker-generic-v2.1 (should be already present in glance)
-* INSTANCE_NAME               - provide a name for the new instance. A UUID will be generated if this is missing
+
+* INSTANCE_NAME               - provide a name for the new instance. It is considered a prefix if it ends with "-" and consecutive numbers are added to the name. A UUID will be generated if this is missing. 
+
 * INSTANCE_FLAVOR             - name of the flavor to be used. defaults to a flavor named e2standard.x5 (should be already defined)
 * INSTANCE_ROOT_SIZE          - self explanatory. defaults to 10 and is in GBytes
 * INSTANCE_ROOT_PERSISTENT    - can be "true" or "false" (default). It sets the instance to delete all related volumes on termination

create_dockerhost.sh

@@ -9,7 +9,40 @@ fi
 #Sanity checks
 ##########################
 
-if [ x$INSTANCE_NAME = 'x' ]; then INSTANCE_NAME="$(python -c 'import sys,uuid; sys.stdout.write(uuid.uuid4().hex)')"; fi
+if [ x$INSTANCE_NAME = 'x' ]; then
+	case "$OS_TENANT_NAME" in
+		dev-env@eea.europa.eu) 
+			INSTANCE_NAME="dev-";;
+		Soren.Roug@eea.europa.eu|Production)
+			INSTANCE_NAME="prod-";;
+                *)
+			INSTANCE_NAME="$(python -c 'import sys,uuid; sys.stdout.write(uuid.uuid4().hex)')";;
+	esac
+	case "$OS_REGION_NAME" in
+		it-mil1)
+			INSTANCE_NAME=$INSTANCE_NAME"mil-";;
+		nl-ams1)
+			INSTANCE_NAME=$INSTANCE_NAME"ams-";;
+		de-fra1)
+			INSTANCE_NAME=$INSTANCE_NAME"fra-";;
+		dk-cph1)	
+			INSTANCE_NAME=$INSTANCE_NAME"cph-";;		
+		*)
+			INSTANCE_NAME="$(python -c 'import sys,uuid; sys.stdout.write(uuid.uuid4().hex)')";;
+	esac
+fi
+
+expr $INSTANCE_NAME : '.*-$'
+if [ $? == 0 ]; then
+	lastno="$(nova list | awk -F '[-,|]' '/'$INSTANCE_NAME'/ {print $9}' | sort | tail -1)"
+	expr $lastno : '[0-9][0-9]*$'
+	if  [ $? == 1 ] ; then
+		lastno=0
+	fi
+       	nextno=`printf "%02d" $((lastno+1))`
+	INSTANCE_NAME=$INSTANCE_NAME$nextno
+fi
+
 
 nova list | grep $INSTANCE_NAME
 if [ $? == 0 ]; then 
@@ -38,7 +71,7 @@ if [ x"$OS_AVAILABILITY_ZONE" != 'x' ]; then injectAVLcmd="--availability-zone";
 #########################
 
 rootvol_id="$(cinder create --image-id $image_id --display-name $INSTANCE_NAME-Root --display-description 'Boot Volume based on '$IMAGE_NAME' image' $INSTANCE_ROOT_SIZE | awk '/\|[ ]+id[ ]+\|/ {print $4}')"
-i=40; vol_status=''
+i=$TIMEOUT; vol_status=''
 echo "Creating Root volume "$INSTANCE_NAME-Root
 while [ $((--i)) -gt 0 -a x$vol_status != 'xavailable' ]; do
    vol_status="$(cinder show $rootvol_id | awk '/\|[ ]+status/ {print $4}')"
@@ -62,7 +95,7 @@ if [ x"$INSTANCE_DOCKERSTORAGE_TYPE" != 'x' ]; then injectVTYPEcmd="--volume-typ
 
 dsvol_id="$(cinder create $injectVTYPEcmd $INSTANCE_DOCKERSTORAGE_TYPE --display-name $INSTANCE_NAME-DockerStorage --display-description 'Docker storage' $INSTANCE_DOCKERSTORAGE_SIZE | awk '/\|[ ]+id[ ]+\|/ {print $4}')"
 echo "Creating Docker Storage volume "$INSTANCE_NAME-DockerStorage
-i=40; vol_status=''
+i=$TIMEOUT; vol_status=''
 while [ $((--i)) -gt 0 -a x$vol_status != 'xavailable' ]; do
    vol_status="$(cinder show $dsvol_id | awk '/\|[ ]+status/ {print $4}')"
    printf "\rWaiting to became available. Will timeout in %s" $((i*10))s
@@ -86,7 +119,7 @@ if [ x"$INSTANCE_DOCKER_VOLUME_TYPE" != 'x' ]; then injectVTYPEcmd="--volume-typ
 if [ $INSTANCE_DOCKER_VOLUME = true ]; then 
   dvvol_id="$(cinder create $injectVTYPEcmd $INSTANCE_DOCKER_VOLUME_TYPE --display-name $INSTANCE_NAME-DockerVolumes --display-description 'Docker volumes' $INSTANCE_DOCKER_VOLUME_SIZE | awk '/\|[ ]+id[ ]+\|/ {print $4}')"
   echo "Creating Docker Volumes volume "$INSTANCE_NAME-DockerVolumes
-  i=40; vol_status=''
+  i=$TIMEOUT; vol_status=''
   while [ $((--i)) -gt 0 -a x$vol_status != 'xavailable' ]; do
      vol_status="$(cinder show $dvvol_id | awk '/\|[ ]+status/ {print $4}')"
      printf "\rWaiting to became available. Will timeout in %s" $((i*10))s
@@ -123,7 +156,7 @@ if [ $INSTANCE_DOCKER_VOLUME == true ]; then injectVOL2cmd="--block-device sourc
 cmd="nova boot --flavor $flavor_id $injectNETcmd $injectNetID$OS_NETWORK_ID --block-device source=volume,id=$rootvol_id,dest=volume,size=$INSTANCE_ROOT_SIZE,shutdown=remove,bootindex=0 --block-device source=volume,id=$dsvol_id,dest=volume,size=$INSTANCE_DOCKERSTORAGE_SIZE,shutdown=remove,bootindex=1 $injectVOL2cmd $injectAVLcmd $OS_AVAILABILITY_ZONE $injectKEY --user-data user_data.file $INSTANCE_NAME | awk '/\|[ ]+id[ ]+\|/ {print \$4}'"
 instance_id="$(eval $cmd)"  
 
-i=40; instance_status=''
+i=$TIMEOUT; instance_status=''
 while [ $((--i)) -gt 0 -a x$instance_status != 'xactive' ]; do
    instance_status="$(nova show $instance_id | awk '/vm_state/ {print $4}')"
    printf "\rWaiting to became active. Will timeout in %s" $((i*10))s