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

The s3 endpoint in China is under a different DNS TLD: amazonaws.com.cn.

Browse source
This commit is contained in:
James Brombegrer 2014-02-07 14:07:45 +00:00
parent 6168717ba9
commit 047920b120
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

@ -58,6 +58,8 @@ class UploadImage(Task):
manifest_file = os.path.join(info.bundle_path, info.ami_name + '.manifest.xml') manifest_file = os.path.join(info.bundle_path, info.ami_name + '.manifest.xml')
if info.host['region'] == 'us-east-1': if info.host['region'] == 'us-east-1':
s3_url = 'https://s3.amazonaws.com/' s3_url = 'https://s3.amazonaws.com/'
elif info.host['region'] == 'cn-north-1':
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'])
log_check_call(['/usr/bin/euca-upload-bundle', log_check_call(['/usr/bin/euca-upload-bundle',