Add Support for GovCloud East

Signed-off-by: Sean Smith <[email protected]>

Author: Sean Smith

CHANGELOG.rst

@@ -4,6 +4,7 @@ CHANGELOG
 
 2.0.2
 =====
+* Add support for GovCloud East, us-gov-east-1 region
 * Fix regression with `shared_dir` parameter in the cluster configuration section.
 * bugfix:``cfncluster-cookbook``: Fix issue with jq on ubuntu1404 and centos6. Now using version 1.4.
 * bugfix:``cfncluster-cookbook``: Fix dependency issue with AWS CLI package on ubuntu1404.

cli/awsbatch/awsbstat.py

@@ -60,7 +60,7 @@ def _compose_log_stream_url(region, log_stream):
     :param log_stream: the log stream name
     :return: an url
     """
-    domain = 'amazonaws-us-gov' if region == 'us-gov-west-1' else 'aws'
+    domain = 'amazonaws-us-gov' if region.startswith('us-gov') else 'aws'
     return "https://console.{0}.amazon.com/cloudwatch/home?" \
            "region={1}#logEventViewer:group=/aws/batch/job;stream={2}".format(domain, region, log_stream)
 

cli/pcluster/cfnconfig.py

@@ -290,10 +290,7 @@ def __init__(self, args):
                         config_sanity.check_resource(self.region, self.aws_access_key_id, self.aws_secret_access_key,
                                                      'URL', self.template_url)
                 except configparser.NoOptionError:
-                    if self.region == 'us-gov-west-1':
-                        self.template_url = ('https://s3-%s.amazonaws.com/%s-aws-parallelcluster/templates/aws-parallelcluster-%s.cfn.json'
-                                             % (self.region, self.region, self.version))
-                    elif self.region == 'us-east-1':
+                    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:

cli/pcluster/config_sanity.py

@@ -22,7 +22,7 @@
 from botocore.exceptions import ClientError
 
 def get_partition(region):
-    if region == 'us-gov-west-1':
+    if region.startswith('us-gov'):
         return 'aws-us-gov'
     return 'aws'
 
@@ -183,7 +183,7 @@ def check_resource(region, aws_access_key_id, aws_secret_access_key, resource_ty
     # Batch Parameters
     elif resource_type == 'AWSBatch_Parameters':
         # Check region
-        if region in ['us-gov-west-1', 'eu-west-3', 'ap-northeast-3']:
+        if region in ['us-gov-west-1', 'us-gov-east-1', 'eu-west-3', 'ap-northeast-3']:
             print ("ERROR: %s region is not supported with awsbatch" % region)
             sys.exit(1)
 

cli/pcluster/pcluster.py

@@ -617,10 +617,7 @@ def get_cookbook_url(config, tmpdir):
         return config.args.custom_ami_cookbook
     else:
         cookbook_version = get_cookbook_version(config, tmpdir)
-        if config.region == 'us-gov-west-1':
-            return ('https://s3-%s.amazonaws.com/%s-aws-parallelcluster/cookbooks/%s.tgz'
-                         % (config.region, config.region, cookbook_version))
-        elif config.region == 'us-east-1':
+        if config.region == 'us-east-1':
             return ('https://s3.amazonaws.com/%s-aws-parallelcluster/cookbooks/%s.tgz'
                          % (config.region, cookbook_version))
         else:
@@ -774,7 +771,7 @@ def create_ami(args):
         if config.aws_secret_access_key:
             packer_env['AWS_SECRET_ACCESS_KEY'] = config.aws_secret_access_key
 
-        if config.region == 'us-gov-west-1':
+        if config.region.startswith('us-gov'):
             partition = 'govcloud'
         else:
             partition = 'commercial'

docs/getting_started.rst

@@ -102,6 +102,7 @@ cluster to run.
             ap-southeast-2
             us-west-2
             us-gov-west-1
+            us-gov-east-1
             us-west-1
             eu-central-1
             sa-east-1

util/generate-ami-list.py

@@ -46,7 +46,7 @@ def get_ami_list(regions, date, version, owner):
             else:
                 amis_json[region_name] = OrderedDict(sorted(amis.items()))
         except ClientError:
-            # skip regions on which we are not authorized (cn-north-1 and us-gov-west-1)
+            # skip regions on which we are not authorized (cn-north-1)
             pass
 
     return amis_json