Merge Release 2.1.1

Release 2.1.1

.gitignore

@@ -10,3 +10,6 @@ build/
 .DS_Store
 .tox/
 *.iml
+.coverage
+assets/
+report.html

CHANGELOG.rst

@@ -2,6 +2,10 @@
 CHANGELOG
 =========
 
+2.1.1
+=====
+* China regions `cn-north-1` and `cn-northwest-1`
+
 2.1.0
 =====
 * RAID support

amis.txt

@@ -1,96 +1,100 @@
 # alinux
-ap-northeast-1: ami-03780c8327e4be0ac
-ap-northeast-2: ami-01eaa2848f762416f
-ap-northeast-3: ami-05625a3c29c8d158d
-ap-south-1: ami-0cb4b6a940244dd2f
-ap-southeast-1: ami-099312510208cc0d3
-ap-southeast-2: ami-04c142f780a8426c2
-ca-central-1: ami-0907f9cad7dbf65f6
-eu-central-1: ami-0595a707dc47e9671
-eu-north-1: ami-09b05710227925ceb
-eu-west-1: ami-0f0865f124c533e6f
-eu-west-2: ami-08c01fbf6cc43e166
-eu-west-3: ami-033bcfc19853275cb
-sa-east-1: ami-0ffb13b9401cc9f43
-us-east-1: ami-025f4816964498a18
-us-east-2: ami-0381cb7486cdc973f
-us-gov-east-1: ami-08e554700cf18e130
-us-gov-west-1: ami-a5ee8fc4
-us-west-1: ami-0f7431c55ad80bfce
-us-west-2: ami-0bdc62a7fa9026972
+ap-northeast-1: ami-0ac1d0c35dc3b2a97
+ap-northeast-2: ami-0dddb89f66485f828
+ap-northeast-3: ami-0dbb09bfada65298f
+ap-south-1: ami-0ed1bb8f2ab0edffb
+ap-southeast-1: ami-058bcd8377aba9bef
+ap-southeast-2: ami-012557ce9426ef1a0
+ca-central-1: ami-059dda8ee9af7c20c
+cn-north-1: ami-00237da8e056b0936
+cn-northwest-1: ami-0974fc483e449f5ee
+eu-central-1: ami-09cff6787920e967c
+eu-north-1: ami-086f4f382fb1119f0
+eu-west-1: ami-080a7d5c75253bd1b
+eu-west-2: ami-0b284f1028a743865
+eu-west-3: ami-099197e40d0c5de6e
+sa-east-1: ami-02e542e4935ff9647
+us-east-1: ami-0cd2dd3198972a68c
+us-east-2: ami-057e70f0fbb007ab6
+us-gov-east-1: ami-022f96b137a63c9ff
+us-gov-west-1: ami-fefb989f
+us-west-1: ami-09686d4090e35a702
+us-west-2: ami-0c588cdc9e91b0db3
 # centos6
-ap-northeast-1: ami-07d83b268e25e0953
-ap-northeast-2: ami-044f3ad0badddf405
-ap-northeast-3: ami-07261626f0608a9fc
-ap-south-1: ami-007862493aa8721a7
-ap-southeast-1: ami-069361480706f302e
-ap-southeast-2: ami-06e0db8bdac11c698
-ca-central-1: ami-00875bb416baf6556
-eu-central-1: ami-07f13c4704a54b165
-eu-north-1: ami-03e7f9bfdcdfe6eca
-eu-west-1: ami-0080ba82e12f317b9
-eu-west-2: ami-0dfae4fa33e540f25
-eu-west-3: ami-0fae6489cef475f35
-sa-east-1: ami-03a2cb750e02692c6
-us-east-1: ami-09d4b0433c3d08284
-us-east-2: ami-0b8ba3e22e08e3870
-us-west-1: ami-06bd36cf904ec0f9a
-us-west-2: ami-084bb82c022317cc5
+ap-northeast-1: ami-003cfe6266cadd576
+ap-northeast-2: ami-032b3f2a4f1ac91a0
+ap-northeast-3: ami-0c4de7aece7b2db33
+ap-south-1: ami-0581583c3d7507d9e
+ap-southeast-1: ami-0d00309b80b772532
+ap-southeast-2: ami-00ecf7e455945e8bc
+ca-central-1: ami-0416d41ed6dbc0bd7
+eu-central-1: ami-0b1f52047bb2b7f83
+eu-north-1: ami-04fc976e8108996e6
+eu-west-1: ami-073f1f5db6cfdd3d1
+eu-west-2: ami-0ace56d1d9c1aa466
+eu-west-3: ami-0d377bccde07c887d
+sa-east-1: ami-0b1c8f6aad337d5b6
+us-east-1: ami-0919d912e0e33d247
+us-east-2: ami-0bbd43b2b8991cdae
+us-west-1: ami-0ac1cf1e68288fa36
+us-west-2: ami-08b28682da5721f5b
 # centos7
-ap-northeast-1: ami-03043938e7fc33ba9
-ap-northeast-2: ami-07ee16085dc31f6ed
-ap-northeast-3: ami-01116deb7081a4d93
-ap-south-1: ami-0823edb0c94157ff4
-ap-southeast-1: ami-074acbf20aa22df0c
-ap-southeast-2: ami-055dd6211ddf02af6
-ca-central-1: ami-052fb2fbfaef380d3
-eu-central-1: ami-05af6f87fc63e3d71
-eu-north-1: ami-0e933380e094ab102
-eu-west-1: ami-0e249c302ebb32aef
-eu-west-2: ami-0836360ea1ef8e1a9
-eu-west-3: ami-0b8e45374e5e2f6ec
-sa-east-1: ami-091c8ba9e3b0a2b6b
-us-east-1: ami-0ed9fbb6accaa70ba
-us-east-2: ami-059415e43c0827abf
-us-west-1: ami-02ca1c89adc7b29f0
-us-west-2: ami-03abc3d448a987e73
+ap-northeast-1: ami-0c0049e4eeb0ef1ac
+ap-northeast-2: ami-00f8f46a043a04530
+ap-northeast-3: ami-0043e5e12872a00d4
+ap-south-1: ami-03dd063b05c3082f1
+ap-southeast-1: ami-00fcdc55bd29f691e
+ap-southeast-2: ami-0baa1787fd7a71950
+ca-central-1: ami-0c2a8b54dfd0c405f
+eu-central-1: ami-00b3f34240b6021dd
+eu-north-1: ami-07ac74edc9e96b343
+eu-west-1: ami-0879d97613ba8075a
+eu-west-2: ami-06aa0ca6f28c29fdb
+eu-west-3: ami-0b28dcaf2b4d00d87
+sa-east-1: ami-00a570d9536621660
+us-east-1: ami-09d092c1b054832df
+us-east-2: ami-0e0cda1cdec7fcecf
+us-west-1: ami-084c065e503e74449
+us-west-2: ami-070345cb145f2d2f0
 # ubuntu1404
-ap-northeast-1: ami-08a720b6bbe06dc15
-ap-northeast-2: ami-03595544457ee270b
-ap-northeast-3: ami-0f4afbf455ad42c20
-ap-south-1: ami-0821b7c6568999205
-ap-southeast-1: ami-0563d0646a1cc2dde
-ap-southeast-2: ami-08209d8fa90d40e5a
-ca-central-1: ami-0b05531dac34df70a
-eu-central-1: ami-0a2c2f9760d34f596
-eu-north-1: ami-04b0fa5a3509e4569
-eu-west-1: ami-06e7f63766bac032b
-eu-west-2: ami-0bf0e4815ea7c3f08
-eu-west-3: ami-0038fece5c9fdcf52
-sa-east-1: ami-05997e9be14a0f785
-us-east-1: ami-09ae02fc417765f4c
-us-east-2: ami-0121231f2883a268e
-us-gov-east-1: ami-0b621c3f09e5e06c4
-us-gov-west-1: ami-50e98831
-us-west-1: ami-0e30c804ef45d3819
-us-west-2: ami-0440f447631cb8f6c
+ap-northeast-1: ami-053a84278e34b7a59
+ap-northeast-2: ami-03d314c5ac10beb53
+ap-northeast-3: ami-070f9069b20a797ec
+ap-south-1: ami-0641d7ca885530589
+ap-southeast-1: ami-0e3de99412375e882
+ap-southeast-2: ami-09eae4580e8fc835a
+ca-central-1: ami-08aeb7a57f73b58ab
+cn-north-1: ami-00f2cae5406fb3fce
+eu-central-1: ami-0b24a435216670b4a
+eu-north-1: ami-0921b515f8ed512c3
+eu-west-1: ami-076fbdec21cd5c940
+eu-west-2: ami-0fb01b5b56bc27509
+eu-west-3: ami-0ea8b79c622d0a4a2
+sa-east-1: ami-00cf3910c959e9fd5
+us-east-1: ami-095016c5ff0ab7ae6
+us-east-2: ami-02a21f90af8a453f0
+us-gov-east-1: ami-09274e2587c4154f2
+us-gov-west-1: ami-6cf0930d
+us-west-1: ami-099ebeb456dbf0646
+us-west-2: ami-05ddc7ec0edb9069f
 # ubuntu1604
-ap-northeast-1: ami-00bd60c479d9b05f2
-ap-northeast-2: ami-00317e3a1c4d47b23
-ap-northeast-3: ami-07942e464687e23cd
-ap-south-1: ami-0fa6a7a4decdae641
-ap-southeast-1: ami-00db94a0965a886a6
-ap-southeast-2: ami-05c16d76720e55964
-ca-central-1: ami-02740f68858b9fc7a
-eu-central-1: ami-003cc41d49855e1ef
-eu-north-1: ami-0ceb6b8e665efdb87
-eu-west-1: ami-02fbb78584905c216
-eu-west-2: ami-090cb83529f72bd53
-eu-west-3: ami-03fcec4562b3cef3c
-sa-east-1: ami-0ba286d64312d26f5
-us-east-1: ami-057dc350619a0bf58
-us-east-2: ami-04c283d05058f6894
-us-gov-east-1: ami-083ba3c9a5c412c8f
-us-gov-west-1: ami-54f19035
-us-west-1: ami-0d1f81f40426d7c25
-us-west-2: ami-0f7c3a7a9e2f3d6a3
+ap-northeast-1: ami-026669cfcef23b3de
+ap-northeast-2: ami-048214d1413ed8462
+ap-northeast-3: ami-038900edb73cb9496
+ap-south-1: ami-0cc424ec58256ea88
+ap-southeast-1: ami-059ba95190db36590
+ap-southeast-2: ami-04df2433ab61d3f37
+ca-central-1: ami-039a1b0ada060b5ce
+cn-north-1: ami-072046713a0458796
+eu-central-1: ami-0d816068d1164f4d2
+eu-north-1: ami-046c32486a9abf742
+eu-west-1: ami-0f641e63ebaf647b1
+eu-west-2: ami-067c1c0157477c166
+eu-west-3: ami-0102caf8c6ec0768a
+sa-east-1: ami-0ef5c70aec338bcfb
+us-east-1: ami-098c8e582ca818cff
+us-east-2: ami-055279b0b09d12a71
+us-gov-east-1: ami-0b664ce8c427b77eb
+us-gov-west-1: ami-5ef6953f
+us-west-1: ami-0db5e85c0b1ce2c20
+us-west-2: ami-02393fa61ac61547a

cli/pcluster/cfnconfig.py

@@ -487,16 +487,12 @@ def __init__(self, args):  # noqa: C901 FIXME!!!
                             self.region, self.aws_access_key_id, self.aws_secret_access_key, "URL", self.template_url
                         )
                 except configparser.NoOptionError:
-                    if self.region == "us-east-1":
-                        self.template_url = (
-                            "https://s3.amazonaws.com/%s-aws-parallelcluster/templates/aws-parallelcluster-%s.cfn.json"
-                            % (self.region, self.version)
-                        )
-                    else:
-                        self.template_url = (
-                            "https://s3.%s.amazonaws.com/%s-aws-parallelcluster/templates/"
-                            "aws-parallelcluster-%s.cfn.json" % (self.region, self.region, self.version)
-                        )
+                    s3_suffix = ".cn" if self.region.startswith("cn") else ""
+                    self.template_url = (
+                        "https://s3.%s.amazonaws.com%s/%s-aws-parallelcluster/templates/"
+                        "aws-parallelcluster-%s.cfn.json" % (self.region, s3_suffix, self.region, self.version)
+                    )
+
         except AttributeError:
             pass
 

cli/pcluster/config_sanity.py

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

cli/pcluster/easyconfig.py

@@ -29,7 +29,7 @@
 from . import cfnconfig
 
 logger = logging.getLogger("pcluster.pcluster")
-unsupported_regions = ["ap-northeast-3", "cn-north-1", "cn-northwest-1"]
+unsupported_regions = ["ap-northeast-3"]
 
 
 def handle_client_exception(func):

cli/pcluster/pcluster.py

@@ -749,11 +749,10 @@ def get_cookbook_url(config, tmpdir):
         return config.args.custom_ami_cookbook
 
     cookbook_version = get_cookbook_version(config, tmpdir)
-    if config.region == "us-east-1":
-        return "https://s3.amazonaws.com/%s-aws-parallelcluster/cookbooks/%s.tgz" % (config.region, cookbook_version)
-
-    return "https://s3.%s.amazonaws.com/%s-aws-parallelcluster/cookbooks/%s.tgz" % (
+    s3_suffix = ".cn" if config.region.startswith("cn") else ""
+    return "https://s3.%s.amazonaws.com%s/%s-aws-parallelcluster/cookbooks/%s.tgz" % (
         config.region,
+        s3_suffix,
         config.region,
         cookbook_version,
     )

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

@@ -4,8 +4,12 @@ set -eu
 push_docker_image() {
     local image=$1
     echo "Uploading image image"
-    docker tag "${IMAGE_REPO_NAME}:${image}" "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${image}"
-    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/${IMAGE_REPO_NAME}:${image}"
+    S3_SUFFIX=""
+    if [[ ${AWS_REGION} == cn-* ]]; then
+        S3_SUFFIX=".cn"
+    fi
+    docker tag "${IMAGE_REPO_NAME}:${image}" "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com${S3_SUFFIX}/${IMAGE_REPO_NAME}:${image}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com${S3_SUFFIX}/${IMAGE_REPO_NAME}:${image}"
 }
 
 if [ -z "${IMAGE}" ]; then

cli/setup.py

@@ -21,7 +21,7 @@ def readme():
         return f.read()
 
 
-VERSION = "2.1.0"
+VERSION = "2.1.1"
 REQUIRES = ["boto3>=1.9.48", "awscli>=1.11.175", "future>=0.16.0", "tabulate>=0.8.2"]
 
 if sys.version_info[:2] == (2, 6):