Merge pull request #409 from crawford/ami

oem/ami: minor fixes

oem/ami/import.sh

@@ -122,7 +122,7 @@ export EC2_URL="https://ec2.${region}.amazonaws.com"
 echo "Building AMI in zone ${EC2_IMPORT_ZONE}"
 
 tmpimg=$(mktemp)
-trap "rm -f '${dldir}'" EXIT
+trap "rm -f '${tmpimg}'" EXIT
 
 # if it is on the local fs, just use it, otherwise try to download it
 if [[ -n "$IMG_PATH" ]]; then

oem/ami/test_ami.sh

@@ -150,7 +150,7 @@ declare -a ips=($($ec2_cmd | grep INSTANCE | cut -f4))
 # sleep until all the sockets we need come up
 for host in ${ips[@]}; do
     for port in 22 4001 7001; do
-        timeout 120 perl -MIO::Socket::INET -e "
+        timeout 300 perl -MIO::Socket::INET -e "
             until(new IO::Socket::INET('$host:$port')){sleep 1}"
     done
 done