Skip to content

Commit 1e0fbc6

Browse files
lukeseawalkerlukeseawalker
authored
Merge Release 2.1.1
Release 2.1.1
2 parents fab9339 + b6cbb97 commit 1e0fbc6

19 files changed

+715
-396
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ build/
1010
.DS_Store
1111
.tox/
1212
*.iml
13+
.coverage
14+
assets/
15+
report.html

‎CHANGELOG.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
CHANGELOG
33
=========
44

5+
2.1.1
6+
=====
7+
* China regions `cn-north-1` and `cn-northwest-1`
8+
59
2.1.0
610
=====
711
* RAID support

‎amis.txt

+95-91
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,100 @@
11
# alinux
2-
ap-northeast-1: ami-03780c8327e4be0ac
3-
ap-northeast-2: ami-01eaa2848f762416f
4-
ap-northeast-3: ami-05625a3c29c8d158d
5-
ap-south-1: ami-0cb4b6a940244dd2f
6-
ap-southeast-1: ami-099312510208cc0d3
7-
ap-southeast-2: ami-04c142f780a8426c2
8-
ca-central-1: ami-0907f9cad7dbf65f6
9-
eu-central-1: ami-0595a707dc47e9671
10-
eu-north-1: ami-09b05710227925ceb
11-
eu-west-1: ami-0f0865f124c533e6f
12-
eu-west-2: ami-08c01fbf6cc43e166
13-
eu-west-3: ami-033bcfc19853275cb
14-
sa-east-1: ami-0ffb13b9401cc9f43
15-
us-east-1: ami-025f4816964498a18
16-
us-east-2: ami-0381cb7486cdc973f
17-
us-gov-east-1: ami-08e554700cf18e130
18-
us-gov-west-1: ami-a5ee8fc4
19-
us-west-1: ami-0f7431c55ad80bfce
20-
us-west-2: ami-0bdc62a7fa9026972
2+
ap-northeast-1: ami-0ac1d0c35dc3b2a97
3+
ap-northeast-2: ami-0dddb89f66485f828
4+
ap-northeast-3: ami-0dbb09bfada65298f
5+
ap-south-1: ami-0ed1bb8f2ab0edffb
6+
ap-southeast-1: ami-058bcd8377aba9bef
7+
ap-southeast-2: ami-012557ce9426ef1a0
8+
ca-central-1: ami-059dda8ee9af7c20c
9+
cn-north-1: ami-00237da8e056b0936
10+
cn-northwest-1: ami-0974fc483e449f5ee
11+
eu-central-1: ami-09cff6787920e967c
12+
eu-north-1: ami-086f4f382fb1119f0
13+
eu-west-1: ami-080a7d5c75253bd1b
14+
eu-west-2: ami-0b284f1028a743865
15+
eu-west-3: ami-099197e40d0c5de6e
16+
sa-east-1: ami-02e542e4935ff9647
17+
us-east-1: ami-0cd2dd3198972a68c
18+
us-east-2: ami-057e70f0fbb007ab6
19+
us-gov-east-1: ami-022f96b137a63c9ff
20+
us-gov-west-1: ami-fefb989f
21+
us-west-1: ami-09686d4090e35a702
22+
us-west-2: ami-0c588cdc9e91b0db3
2123
# centos6
22-
ap-northeast-1: ami-07d83b268e25e0953
23-
ap-northeast-2: ami-044f3ad0badddf405
24-
ap-northeast-3: ami-07261626f0608a9fc
25-
ap-south-1: ami-007862493aa8721a7
26-
ap-southeast-1: ami-069361480706f302e
27-
ap-southeast-2: ami-06e0db8bdac11c698
28-
ca-central-1: ami-00875bb416baf6556
29-
eu-central-1: ami-07f13c4704a54b165
30-
eu-north-1: ami-03e7f9bfdcdfe6eca
31-
eu-west-1: ami-0080ba82e12f317b9
32-
eu-west-2: ami-0dfae4fa33e540f25
33-
eu-west-3: ami-0fae6489cef475f35
34-
sa-east-1: ami-03a2cb750e02692c6
35-
us-east-1: ami-09d4b0433c3d08284
36-
us-east-2: ami-0b8ba3e22e08e3870
37-
us-west-1: ami-06bd36cf904ec0f9a
38-
us-west-2: ami-084bb82c022317cc5
24+
ap-northeast-1: ami-003cfe6266cadd576
25+
ap-northeast-2: ami-032b3f2a4f1ac91a0
26+
ap-northeast-3: ami-0c4de7aece7b2db33
27+
ap-south-1: ami-0581583c3d7507d9e
28+
ap-southeast-1: ami-0d00309b80b772532
29+
ap-southeast-2: ami-00ecf7e455945e8bc
30+
ca-central-1: ami-0416d41ed6dbc0bd7
31+
eu-central-1: ami-0b1f52047bb2b7f83
32+
eu-north-1: ami-04fc976e8108996e6
33+
eu-west-1: ami-073f1f5db6cfdd3d1
34+
eu-west-2: ami-0ace56d1d9c1aa466
35+
eu-west-3: ami-0d377bccde07c887d
36+
sa-east-1: ami-0b1c8f6aad337d5b6
37+
us-east-1: ami-0919d912e0e33d247
38+
us-east-2: ami-0bbd43b2b8991cdae
39+
us-west-1: ami-0ac1cf1e68288fa36
40+
us-west-2: ami-08b28682da5721f5b
3941
# centos7
40-
ap-northeast-1: ami-03043938e7fc33ba9
41-
ap-northeast-2: ami-07ee16085dc31f6ed
42-
ap-northeast-3: ami-01116deb7081a4d93
43-
ap-south-1: ami-0823edb0c94157ff4
44-
ap-southeast-1: ami-074acbf20aa22df0c
45-
ap-southeast-2: ami-055dd6211ddf02af6
46-
ca-central-1: ami-052fb2fbfaef380d3
47-
eu-central-1: ami-05af6f87fc63e3d71
48-
eu-north-1: ami-0e933380e094ab102
49-
eu-west-1: ami-0e249c302ebb32aef
50-
eu-west-2: ami-0836360ea1ef8e1a9
51-
eu-west-3: ami-0b8e45374e5e2f6ec
52-
sa-east-1: ami-091c8ba9e3b0a2b6b
53-
us-east-1: ami-0ed9fbb6accaa70ba
54-
us-east-2: ami-059415e43c0827abf
55-
us-west-1: ami-02ca1c89adc7b29f0
56-
us-west-2: ami-03abc3d448a987e73
42+
ap-northeast-1: ami-0c0049e4eeb0ef1ac
43+
ap-northeast-2: ami-00f8f46a043a04530
44+
ap-northeast-3: ami-0043e5e12872a00d4
45+
ap-south-1: ami-03dd063b05c3082f1
46+
ap-southeast-1: ami-00fcdc55bd29f691e
47+
ap-southeast-2: ami-0baa1787fd7a71950
48+
ca-central-1: ami-0c2a8b54dfd0c405f
49+
eu-central-1: ami-00b3f34240b6021dd
50+
eu-north-1: ami-07ac74edc9e96b343
51+
eu-west-1: ami-0879d97613ba8075a
52+
eu-west-2: ami-06aa0ca6f28c29fdb
53+
eu-west-3: ami-0b28dcaf2b4d00d87
54+
sa-east-1: ami-00a570d9536621660
55+
us-east-1: ami-09d092c1b054832df
56+
us-east-2: ami-0e0cda1cdec7fcecf
57+
us-west-1: ami-084c065e503e74449
58+
us-west-2: ami-070345cb145f2d2f0
5759
# ubuntu1404
58-
ap-northeast-1: ami-08a720b6bbe06dc15
59-
ap-northeast-2: ami-03595544457ee270b
60-
ap-northeast-3: ami-0f4afbf455ad42c20
61-
ap-south-1: ami-0821b7c6568999205
62-
ap-southeast-1: ami-0563d0646a1cc2dde
63-
ap-southeast-2: ami-08209d8fa90d40e5a
64-
ca-central-1: ami-0b05531dac34df70a
65-
eu-central-1: ami-0a2c2f9760d34f596
66-
eu-north-1: ami-04b0fa5a3509e4569
67-
eu-west-1: ami-06e7f63766bac032b
68-
eu-west-2: ami-0bf0e4815ea7c3f08
69-
eu-west-3: ami-0038fece5c9fdcf52
70-
sa-east-1: ami-05997e9be14a0f785
71-
us-east-1: ami-09ae02fc417765f4c
72-
us-east-2: ami-0121231f2883a268e
73-
us-gov-east-1: ami-0b621c3f09e5e06c4
74-
us-gov-west-1: ami-50e98831
75-
us-west-1: ami-0e30c804ef45d3819
76-
us-west-2: ami-0440f447631cb8f6c
60+
ap-northeast-1: ami-053a84278e34b7a59
61+
ap-northeast-2: ami-03d314c5ac10beb53
62+
ap-northeast-3: ami-070f9069b20a797ec
63+
ap-south-1: ami-0641d7ca885530589
64+
ap-southeast-1: ami-0e3de99412375e882
65+
ap-southeast-2: ami-09eae4580e8fc835a
66+
ca-central-1: ami-08aeb7a57f73b58ab
67+
cn-north-1: ami-00f2cae5406fb3fce
68+
eu-central-1: ami-0b24a435216670b4a
69+
eu-north-1: ami-0921b515f8ed512c3
70+
eu-west-1: ami-076fbdec21cd5c940
71+
eu-west-2: ami-0fb01b5b56bc27509
72+
eu-west-3: ami-0ea8b79c622d0a4a2
73+
sa-east-1: ami-00cf3910c959e9fd5
74+
us-east-1: ami-095016c5ff0ab7ae6
75+
us-east-2: ami-02a21f90af8a453f0
76+
us-gov-east-1: ami-09274e2587c4154f2
77+
us-gov-west-1: ami-6cf0930d
78+
us-west-1: ami-099ebeb456dbf0646
79+
us-west-2: ami-05ddc7ec0edb9069f
7780
# ubuntu1604
78-
ap-northeast-1: ami-00bd60c479d9b05f2
79-
ap-northeast-2: ami-00317e3a1c4d47b23
80-
ap-northeast-3: ami-07942e464687e23cd
81-
ap-south-1: ami-0fa6a7a4decdae641
82-
ap-southeast-1: ami-00db94a0965a886a6
83-
ap-southeast-2: ami-05c16d76720e55964
84-
ca-central-1: ami-02740f68858b9fc7a
85-
eu-central-1: ami-003cc41d49855e1ef
86-
eu-north-1: ami-0ceb6b8e665efdb87
87-
eu-west-1: ami-02fbb78584905c216
88-
eu-west-2: ami-090cb83529f72bd53
89-
eu-west-3: ami-03fcec4562b3cef3c
90-
sa-east-1: ami-0ba286d64312d26f5
91-
us-east-1: ami-057dc350619a0bf58
92-
us-east-2: ami-04c283d05058f6894
93-
us-gov-east-1: ami-083ba3c9a5c412c8f
94-
us-gov-west-1: ami-54f19035
95-
us-west-1: ami-0d1f81f40426d7c25
96-
us-west-2: ami-0f7c3a7a9e2f3d6a3
81+
ap-northeast-1: ami-026669cfcef23b3de
82+
ap-northeast-2: ami-048214d1413ed8462
83+
ap-northeast-3: ami-038900edb73cb9496
84+
ap-south-1: ami-0cc424ec58256ea88
85+
ap-southeast-1: ami-059ba95190db36590
86+
ap-southeast-2: ami-04df2433ab61d3f37
87+
ca-central-1: ami-039a1b0ada060b5ce
88+
cn-north-1: ami-072046713a0458796
89+
eu-central-1: ami-0d816068d1164f4d2
90+
eu-north-1: ami-046c32486a9abf742
91+
eu-west-1: ami-0f641e63ebaf647b1
92+
eu-west-2: ami-067c1c0157477c166
93+
eu-west-3: ami-0102caf8c6ec0768a
94+
sa-east-1: ami-0ef5c70aec338bcfb
95+
us-east-1: ami-098c8e582ca818cff
96+
us-east-2: ami-055279b0b09d12a71
97+
us-gov-east-1: ami-0b664ce8c427b77eb
98+
us-gov-west-1: ami-5ef6953f
99+
us-west-1: ami-0db5e85c0b1ce2c20
100+
us-west-2: ami-02393fa61ac61547a

‎cli/pcluster/cfnconfig.py

+6-10
Original file line numberDiff line numberDiff line change
@@ -487,16 +487,12 @@ def __init__(self, args): # noqa: C901 FIXME!!!
487487
self.region, self.aws_access_key_id, self.aws_secret_access_key, "URL", self.template_url
488488
)
489489
except configparser.NoOptionError:
490-
if self.region == "us-east-1":
491-
self.template_url = (
492-
"https://s3.amazonaws.com/%s-aws-parallelcluster/templates/aws-parallelcluster-%s.cfn.json"
493-
% (self.region, self.version)
494-
)
495-
else:
496-
self.template_url = (
497-
"https://s3.%s.amazonaws.com/%s-aws-parallelcluster/templates/"
498-
"aws-parallelcluster-%s.cfn.json" % (self.region, self.region, self.version)
499-
)
490+
s3_suffix = ".cn" if self.region.startswith("cn") else ""
491+
self.template_url = (
492+
"https://s3.%s.amazonaws.com%s/%s-aws-parallelcluster/templates/"
493+
"aws-parallelcluster-%s.cfn.json" % (self.region, s3_suffix, self.region, self.version)
494+
)
495+
500496
except AttributeError:
501497
pass
502498

‎cli/pcluster/config_sanity.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ def check_resource( # noqa: C901 FIXME!!!
413413
# Batch Parameters
414414
elif resource_type == "AWSBatch_Parameters":
415415
# Check region
416-
if region in ["us-gov-west-1", "us-gov-east-1", "eu-west-3", "ap-northeast-3"]:
416+
if region in ["ap-northeast-3", "eu-north-1", "cn-north-1", "cn-northwest-1", "us-gov-east-1", "us-gov-west-1"]:
417417
print("ERROR: %s region is not supported with awsbatch" % region)
418418
sys.exit(1)
419419

‎cli/pcluster/easyconfig.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from . import cfnconfig
3030

3131
logger = logging.getLogger("pcluster.pcluster")
32-
unsupported_regions = ["ap-northeast-3", "cn-north-1", "cn-northwest-1"]
32+
unsupported_regions = ["ap-northeast-3"]
3333

3434

3535
def handle_client_exception(func):

‎cli/pcluster/pcluster.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -749,11 +749,10 @@ def get_cookbook_url(config, tmpdir):
749749
return config.args.custom_ami_cookbook
750750

751751
cookbook_version = get_cookbook_version(config, tmpdir)
752-
if config.region == "us-east-1":
753-
return "https://s3.amazonaws.com/%s-aws-parallelcluster/cookbooks/%s.tgz" % (config.region, cookbook_version)
754-
755-
return "https://s3.%s.amazonaws.com/%s-aws-parallelcluster/cookbooks/%s.tgz" % (
752+
s3_suffix = ".cn" if config.region.startswith("cn") else ""
753+
return "https://s3.%s.amazonaws.com%s/%s-aws-parallelcluster/cookbooks/%s.tgz" % (
756754
config.region,
755+
s3_suffix,
757756
config.region,
758757
cookbook_version,
759758
)

‎cli/pcluster/resources/batch/docker/upload-docker-images.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ set -eu
44
push_docker_image() {
55
local image=$1
66
echo "Uploading image image"
7-
docker tag "${IMAGE_REPO_NAME}:${image}" "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${image}"
8-
docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${image}"
7+
S3_SUFFIX=""
8+
if [[ ${AWS_REGION} == cn-* ]]; then
9+
S3_SUFFIX=".cn"
10+
fi
11+
docker tag "${IMAGE_REPO_NAME}:${image}" "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com${S3_SUFFIX}/${IMAGE_REPO_NAME}:${image}"
12+
docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com${S3_SUFFIX}/${IMAGE_REPO_NAME}:${image}"
913
}
1014

1115
if [ -z "${IMAGE}" ]; then

‎cli/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def readme():
2121
return f.read()
2222

2323

24-
VERSION = "2.1.0"
24+
VERSION = "2.1.1"
2525
REQUIRES = ["boto3>=1.9.48", "awscli>=1.11.175", "future>=0.16.0", "tabulate>=0.8.2"]
2626

2727
if sys.version_info[:2] == (2, 6):

0 commit comments

Comments
 (0)