Skip to content

Commit c7ca33e

Browse files
lukeseawalkerSean Smith
authored andcommitted
Fix getting the right aws-cfn-bootstrap-latest from cn-north-1
The package aws-cfn-bootstrap-latest.tar.gz does not exist in cn-northwest-1 Signed-off-by: Luca Carrogu <[email protected]>
1 parent 011b532 commit c7ca33e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

amis/packer_centos6.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
"inline" : [
241241
"region=\"{{user `region`}}\"",
242242
"bucket=\"s3.${region}.amazonaws.com\"",
243-
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.${region}.amazonaws.com.cn\"",
243+
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.cn-north-1.amazonaws.com.cn\"",
244244
"curl --retry 3 -L -o /tmp/aws-cfn-bootstrap-latest.tar.gz https://${bucket}/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz",
245245
"sudo pip install /tmp/aws-cfn-bootstrap-latest.tar.gz"
246246
]

amis/packer_centos7.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
"inline" : [
238238
"region=\"{{user `region`}}\"",
239239
"bucket=\"s3.${region}.amazonaws.com\"",
240-
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.${region}.amazonaws.com.cn\"",
240+
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.cn-north-1.amazonaws.com.cn\"",
241241
"curl --retry 3 -L -o /tmp/aws-cfn-bootstrap-latest.tar.gz https://${bucket}/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz",
242242
"which pip2",
243243
"if [ $? -eq 0 ]; then sudo pip2 install /tmp/aws-cfn-bootstrap-latest.tar.gz; else sudo pip install /tmp/aws-cfn-bootstrap-latest.tar.gz; fi"

amis/packer_ubuntu1404.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
"inline" : [
258258
"region=\"{{user `region`}}\"",
259259
"bucket=\"s3.${region}.amazonaws.com\"",
260-
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.${region}.amazonaws.com.cn\"",
260+
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.cn-north-1.amazonaws.com.cn\"",
261261
"sudo curl --retry 3 https://${bucket}/${region}-aws-parallelcluster/cookbooks/aws-parallelcluster-cookbook-{{user `parallelcluster_cookbook_version`}}.tgz --silent --location -o /etc/chef/aws-parallelcluster-cookbook.tgz"
262262
]
263263
},

amis/packer_ubuntu1604.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
"inline" : [
250250
"region=\"{{user `region`}}\"",
251251
"bucket=\"s3.${region}.amazonaws.com\"",
252-
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.${region}.amazonaws.com.cn\"",
252+
"[[ ${region} =~ ^cn- ]] && bucket=\"s3.cn-north-1.amazonaws.com.cn\"",
253253
"curl --retry 3 -L -o /tmp/aws-cfn-bootstrap-latest.tar.gz https://${bucket}/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz",
254254
"sudo pip install /tmp/aws-cfn-bootstrap-latest.tar.gz"
255255
]

0 commit comments

Comments
 (0)