mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 14:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #409 from crawford/ami

Browse Source 
oem/ami: minor fixes
This commit is contained in:
Alex Crawford 2015-05-11 20:12:36 -07:00
commit c88ae61a5d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oem/ami/import.sh
View File

@ -122,7 +122,7 @@ export EC2_URL="https://ec2.${region}.amazonaws.com"
echo "Building AMI in zone ${EC2_IMPORT_ZONE}" echo "Building AMI in zone ${EC2_IMPORT_ZONE}"
tmpimg=$(mktemp) 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 it is on the local fs, just use it, otherwise try to download it
if [[ -n "$IMG_PATH" ]]; then if [[ -n "$IMG_PATH" ]]; then

2
oem/ami/test_ami.sh
View File

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