From 047920b1208c5702237a31f0e790d0df3b2233a9 Mon Sep 17 00:00:00 2001 From: James Brombegrer Date: Fri, 7 Feb 2014 14:07:45 +0000 Subject: [PATCH] The s3 endpoint in China is under a different DNS TLD: amazonaws.com.cn. --- providers/ec2/tasks/ami.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/providers/ec2/tasks/ami.py b/providers/ec2/tasks/ami.py index 865e636..bf8a987 100644 --- a/providers/ec2/tasks/ami.py +++ b/providers/ec2/tasks/ami.py @@ -58,6 +58,8 @@ class UploadImage(Task): manifest_file = os.path.join(info.bundle_path, info.ami_name + '.manifest.xml') if info.host['region'] == 'us-east-1': s3_url = 'https://s3.amazonaws.com/' + elif info.host['region'] == 'cn-north-1': + s3_url = 'https://s3.cn-north-1.amazonaws.com.cn' else: s3_url = 'https://s3-{region}.amazonaws.com/'.format(region=info.host['region']) log_check_call(['/usr/bin/euca-upload-bundle',