kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add image_location param when registering an S3 backde AMI.

Browse source
This commit is contained in:
James Bromberger 2014-02-08 16:16:02 +00:00
parent b64ad495ab
commit c708e5ab42
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
providers/ec2/tasks/ami.py
View file

@ -62,6 +62,7 @@ class UploadImage(Task):
s3_url = 'https://s3.cn-north-1.amazonaws.com.cn' s3_url = 'https://s3.cn-north-1.amazonaws.com.cn'
else: else:
s3_url = 'https://s3-{region}.amazonaws.com/'.format(region=info.host['region']) s3_url = 'https://s3-{region}.amazonaws.com/'.format(region=info.host['region'])
info.manifest.manifest_location = info.manifest.image['bucket'] + '/' + info.ami_name + '.manifest.xml'
log_check_call(['/usr/bin/euca-upload-bundle', log_check_call(['/usr/bin/euca-upload-bundle',
'--bucket', info.manifest.image['bucket'], '--bucket', info.manifest.image['bucket'],
'--manifest', manifest_file, '--manifest', manifest_file,
@ -140,6 +141,7 @@ class RegisterAMI(Task):
if info.manifest.volume['backing'] == 's3': if info.manifest.volume['backing'] == 's3':
grub_boot_device = 'hd0' grub_boot_device = 'hd0'
registration_params['image_location'] = info.manifest.manifest_location
else: else:
root_dev_name = {'pvm': '/dev/sda', root_dev_name = {'pvm': '/dev/sda',
'hvm': '/dev/xvda'}.get(info.manifest.data['virtualization']) 'hvm': '/dev/xvda'}.get(info.manifest.data['virtualization'])