aws script tweaks

git-svn-id: http://svn.opengeo.org/suite/trunk@2325 fe66add1-021f-4af3-b75b-ea5154e73f91

Author: jdeolive

aws/amis

@@ -1,4 +1,4 @@
 ubuntu 10.04 i386: ami-7000f019
-ubuntu 10.04 x86_64: ami-3202f25
+ubuntu 10.04 x86_64: ami-3202f25b
 centos 5.5 i386: ami-2675854f
 

aws/build_ubuntu_ami.sh

@@ -54,7 +54,7 @@ function poll_instance() {
 }
 
 if [ -z $2 ]; then
-  echo "Usage: $0 AMI_ID IMAGE_NAME [-t 'ebs'|'s3'] [ -a 'i386'|'x86_64']"
+  echo "Usage: $0 AMI_ID IMAGE_NAME [-t 'ebs'|'s3'] [ -a 'i386'|'x86_64'] [ -s 'm1.small'|'m1.large'] [--skip-create-image]"
   exit 1
 fi
 
@@ -65,11 +65,15 @@ check_ec2_tools
 args=( $* )
 for (( i = 2; i < ${#args[*]}; i++ )); do
   arg=${args[$i]}
+  val=${args[(( i+1 ))]}
   if [ $arg == "-t" ]; then
-    IMAGE_TYPE=${args[(( i+1 ))]}
+    IMAGE_TYPE=$val
   fi
   if [ $arg == "-a" ]; then
-    IMAGE_ARCH=${args[(( i+1 ))]}
+    IMAGE_ARCH=$val
+  fi
+  if [ $arg == "-s" ]; then
+    IMAGE_SIZE=$val
   fi
   if [ $arg == "--skip-create-image" ]; then
     SKIP_CREATE_IMAGE="yes"
@@ -82,13 +86,19 @@ fi
 if [ -z $IMAGE_ARCH ]; then
   IMAGE_ARCH="i386"
 fi
+if [ -z $IMAGE_SIZE ]; then
+  IMAGE_SIZE="m1.small"
+  if [ $IMAGE_ARCH == "x86_64" ]; then
+    IMAGE_SIZE="m1.large"
+  fi 
+fi
 
 AMI_ID=$1
 IMAGE_NAME=$2
 CLIENT_TOKEN=`uuidgen`
 
 log "Starting instance from ami $AMI_ID with client token $CLIENT_TOKEN"
-ec2-run-instances -k suite $AMI_ID --client-token $CLIENT_TOKEN 
+ec2-run-instances -k suite -t $IMAGE_SIZE $AMI_ID --client-token $CLIENT_TOKEN 
 check_rc $? "ec2-run-instances"
 
 log "Polling instance"

aws/functions

@@ -61,7 +61,7 @@ function ec2_instance_host() {
 # ec2_volume_status <volume-id>
 ec2_volume_status() {
   if [ ! -z $1 ]; then
-    status=`ec2-describe-volumes -F volume-id=$1 | cut -f 6`
+    status=`ec2-describe-volumes $1 | cut -f 6`
   fi
 
   echo -n $status

aws/setup_raid.sh

@@ -3,7 +3,7 @@
 . functions
 
 if [ -z $5 ]; then
-  echo "Usage: $0 NVOL SIZE DEV MNT INSTANCE_ID ZONE [--with-volumes "vol1,vol1,..."] [--skip-create-volumes]"
+  echo "Usage: $0 NVOL SIZE DEV MNT INSTANCE_ID ZONE [--skip-create-volumes] [--with-volumes vol1 vol2 ...]"
   exit 1
 fi
 
@@ -36,7 +36,7 @@ for (( i=6; i < ${#args[*]}; i++ )); do
          exit 1
        fi
 
-       vol_ids[$i]=$vol_id
+       vol_ids[(( j-i-1 ))]=$vol_id
      done
 
      break
@@ -127,7 +127,7 @@ if [ $RAID_MODE == "create" ]; then
   --raid-devices $NVOL ${devs[*]}
   check_rc $? "mdadm"
 else
-  sudo mdadm --assemble ${devs[*]}
+  sudo mdadm --assemble $DEV ${devs[*]}
 fi
 
 # update mdadm.conf