public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create AMIs with Enhanced Networking

Browse Source 
Fixes #15956.
This commit is contained in:
Eelco Dolstra 2016-07-12 16:40:36 +02:00
parent d9724bcdbf
commit 02db7d9821
1 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
nixos/maintainers/scripts/ec2/create-amis.sh
View File

@ -51,10 +51,11 @@ for type in hvm pv; do
echo "doing $name in $region..." echo "doing $name in $region..."
if [ -n "$prevAmi" ]; then if [ -n "$prevAmi" ]; then
ami=$(ec2-copy-image \ ami=$(aws ec2 copy-image \
--region "$region" \ --region "$region" \
--source-region "$prevRegion" --source-ami-id "$prevAmi" \ --source-region "$prevRegion" --source-image-id "$prevAmi" \
--name "$name" --description "$description" | cut -f 2) --name "$name" --description "$description" | json -q .ImageId)
if [ "$ami" = null ]; then break; fi
else else
if [ $store = s3 ]; then if [ $store = s3 ]; then
@ -85,12 +86,12 @@ for type in hvm pv; do
ec2-upload-bundle \ ec2-upload-bundle \
-m $imageDir/$type.raw.manifest.xml \ -m $imageDir/$type.raw.manifest.xml \
-b "$bucket/$bucketDir" \ -b "$bucket/$bucketDir" \
-a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" \ -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" \
--location EU --location EU
touch $imageDir/uploaded touch $imageDir/uploaded
fi fi
extraFlags="$bucket/$bucketDir/$type.raw.manifest.xml" extraFlags="--image-location $bucket/$bucketDir/$type.raw.manifest.xml"
else else
@ -115,7 +116,8 @@ for type in hvm pv; do
if [ -z "$snapId" -a -z "$volId" -a -z "$taskId" ]; then if [ -z "$snapId" -a -z "$volId" -a -z "$taskId" ]; then
echo "importing $vhdFile..." echo "importing $vhdFile..."
taskId=$(ec2-import-volume $vhdFile --no-upload -f vhd \ taskId=$(ec2-import-volume $vhdFile --no-upload -f vhd \
-o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" \ -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \
-o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" \
--region "$region" -z "${region}a" \ --region "$region" -z "${region}a" \
--bucket "$bucket" --prefix "$bucketDir/" \ --bucket "$bucket" --prefix "$bucketDir/" \
| tee /dev/stderr \ | tee /dev/stderr \
@ -125,15 +127,16 @@ for type in hvm pv; do
if [ -z "$snapId" -a -z "$volId" ]; then if [ -z "$snapId" -a -z "$volId" ]; then
ec2-resume-import $vhdFile -t "$taskId" --region "$region" \ ec2-resume-import $vhdFile -t "$taskId" --region "$region" \
-o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" -O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \
-o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY"
fi fi
# Wait for the volume creation to finish. # Wait for the volume creation to finish.
if [ -z "$snapId" -a -z "$volId" ]; then if [ -z "$snapId" -a -z "$volId" ]; then
echo "waiting for import to finish..." echo "waiting for import to finish..."
while true; do while true; do
volId=$(ec2-describe-conversion-tasks "$taskId" --region "$region" | sed 's/.*VolumeId.*\(vol-[0-9a-f]\+\).*/\1/ ; t ; d') volId=$(aws ec2 describe-conversion-tasks --conversion-task-ids "$taskId" --region "$region" | jq -r .ConversionTasks[0].ImportVolume.Volume.Id)
if [ -n "$volId" ]; then break; fi if [ "$volId" != null ]; then break; fi
sleep 10 sleep 10
done done
@ -143,22 +146,24 @@ for type in hvm pv; do
# Delete the import task. # Delete the import task.
if [ -n "$volId" -a -n "$taskId" ]; then if [ -n "$volId" -a -n "$taskId" ]; then
echo "removing import task..." echo "removing import task..."
ec2-delete-disk-image -t "$taskId" --region "$region" -o "$EC2_ACCESS_KEY" -w "$EC2_SECRET_KEY" || true ec2-delete-disk-image -t "$taskId" --region "$region" \
-O "$AWS_ACCESS_KEY_ID" -W "$AWS_SECRET_ACCESS_KEY" \
-o "$AWS_ACCESS_KEY_ID" -w "$AWS_SECRET_ACCESS_KEY" || true
rm -f $stateDir/$region.$type.task-id rm -f $stateDir/$region.$type.task-id
fi fi
# Create a snapshot. # Create a snapshot.
if [ -z "$snapId" ]; then if [ -z "$snapId" ]; then
echo "creating snapshot..." echo "creating snapshot..."
snapId=$(ec2-create-snapshot "$volId" --region "$region" | cut -f 2) snapId=$(aws ec2 create-snapshot --volume-id "$volId" --region "$region" --description "$description" | jq -r .SnapshotId)
if [ "$snapId" = null ]; then exit 1; fi
echo -n "$snapId" > $stateDir/$region.$type.snap-id echo -n "$snapId" > $stateDir/$region.$type.snap-id
ec2-create-tags "$snapId" -t "Name=$description" --region "$region"
fi fi
# Wait for the snapshot to finish. # Wait for the snapshot to finish.
echo "waiting for snapshot to finish..." echo "waiting for snapshot to finish..."
while true; do while true; do
status=$(ec2-describe-snapshots "$snapId" --region "$region" | head -n1 | cut -f 4) status=$(aws ec2 describe-snapshots --snapshot-ids "$snapId" --region "$region" | jq -r .Snapshots[0].State)
if [ "$status" = completed ]; then break; fi if [ "$status" = completed ]; then break; fi
sleep 10 sleep 10
done done
@ -166,35 +171,50 @@ for type in hvm pv; do
# Delete the volume. # Delete the volume.
if [ -n "$volId" ]; then if [ -n "$volId" ]; then
echo "deleting volume..." echo "deleting volume..."
ec2-delete-volume "$volId" --region "$region" || true aws ec2 delete-volume --volume-id "$volId" --region "$region" || true
rm -f $stateDir/$region.$type.vol-id rm -f $stateDir/$region.$type.vol-id
fi fi
extraFlags="-b /dev/sda1=$snapId:$vhdFileLogicalGigaBytes:true:gp2" blockDeviceMappings="DeviceName=/dev/sda1,Ebs={SnapshotId=$snapId,VolumeSize=$vhdFileLogicalGigaBytes,DeleteOnTermination=true,VolumeType=gp2}"
extraFlags=""
if [ $type = pv ]; then if [ $type = pv ]; then
extraFlags+=" --root-device-name=/dev/sda1" extraFlags+=" --root-device-name /dev/sda1"
else
extraFlags+=" --root-device-name /dev/sda1"
extraFlags+=" --sriov-net-support simple"
extraFlags+=" --ena-support"
fi fi
extraFlags+=" -b /dev/sdb=ephemeral0 -b /dev/sdc=ephemeral1 -b /dev/sdd=ephemeral2 -b /dev/sde=ephemeral3" blockDeviceMappings+=" DeviceName=/dev/sdb,VirtualName=ephemeral0"
blockDeviceMappings+=" DeviceName=/dev/sdc,VirtualName=ephemeral1"
blockDeviceMappings+=" DeviceName=/dev/sdd,VirtualName=ephemeral2"
blockDeviceMappings+=" DeviceName=/dev/sde,VirtualName=ephemeral3"
fi
if [ $type = hvm ]; then
extraFlags+=" --sriov-net-support simple"
extraFlags+=" --ena-support"
fi fi
# Register the AMI. # Register the AMI.
if [ $type = pv ]; then if [ $type = pv ]; then
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2) kernel=$(aws ec2 describe-images --owner amazon --filters "Name=name,Values=pv-grub-hd0_1.04-$arch.gz" | jq -r .Images[0].ImageId)
[ -n "$kernel" ] if [ "$kernel" = null ]; then break; fi
echo "using PV-GRUB kernel $kernel" echo "using PV-GRUB kernel $kernel"
extraFlags+=" --virtualization-type paravirtual --kernel $kernel" extraFlags+=" --virtualization-type paravirtual --kernel $kernel"
else else
extraFlags+=" --virtualization-type hvm" extraFlags+=" --virtualization-type hvm"
fi fi
ami=$(ec2-register \ ami=$(aws ec2 register-image \
-n "$name" \ --name "$name" \
-d "$description" \ --description "$description" \
--region "$region" \ --region "$region" \
--architecture "$arch" \ --architecture "$arch" \
$extraFlags | cut -f 2) --block-device-mappings $blockDeviceMappings \
$extraFlags | jq -r .ImageId)
if [ "$ami" = null ]; then break; fi
fi fi
echo -n "$ami" > $amiFile echo -n "$ami" > $amiFile
@ -204,19 +224,23 @@ for type in hvm pv; do
ami=$(cat $amiFile) ami=$(cat $amiFile)
fi fi
echo "region = $region, type = $type, store = $store, ami = $ami"
if [ -z "$NO_WAIT" -o -z "$prevAmi" ]; then if [ -z "$NO_WAIT" -o -z "$prevAmi" ]; then
echo "waiting for AMI..." echo -n "waiting for AMI..."
while true; do while true; do
status=$(ec2-describe-images "$ami" --region "$region" | head -n1 | cut -f 5) status=$(aws ec2 describe-images --image-ids "$ami" --region "$region" | jq -r .Images[0].State)
if [ "$status" = available ]; then break; fi if [ "$status" = available ]; then break; fi
sleep 10 sleep 10
echo -n '.'
done done
echo
ec2-modify-image-attribute \ # Make the image public.
--region "$region" "$ami" -l -a all aws ec2 modify-image-attribute \
--image-id "$ami" --region "$region" --launch-permission 'Add={Group=all}'
fi fi
echo "region = $region, type = $type, store = $store, ami = $ami"
if [ -z "$prevAmi" ]; then if [ -z "$prevAmi" ]; then
prevAmi="$ami" prevAmi="$ami"
prevRegion="$region" prevRegion="$region"