Merge pull request #243 from sean-smith/merge-master

Release 2.1.0

Author: Sean Smith

CHANGELOG.md

@@ -3,6 +3,18 @@ aws-parallelcluster-cookbook CHANGELOG
 
 This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
 
+2.1.0
+-----
+
+- EFS support
+- RAID support
+
+2.0.2
+-----
+
+- Fix issue with jq on ubuntu1404 and centos6. Now using version 1.4
+- Fix dependency issue with AWS CLI package on ubuntu1404
+
 2.0.0
 -----
 

LICENSE.txt

@@ -13,7 +13,7 @@
 #
 # Usage: build_ami.sh --os <os> --region <region> --partition <partition> [--public] [--custom] [--build-date <build-date>]
 #   os: the os to build (supported values: all|centos6|centos7|alinux|ubuntu1404|ubuntu1604)
-#   partition: partition to build in (supported values: commercial|govcloud)
+#   partition: partition to build in (supported values: commercial|govcloud|china)
 #   region: region to copy ami too (supported values: all|us-east-1|us-gov-west-1|...)
 #   custom: specifies to create the AMI from a custom AMI-id, which must be specified by variable CUSTOM_AMI_ID in the environment (optional)
 #   public: specifies AMIs visibility (optional, default is private)
@@ -131,9 +131,13 @@ check_options() {
       export AWS_REGION="us-east-1"
     elif [ "${_partition}" == "govcloud" ]; then
       export AWS_REGION="us-gov-west-1"
+    elif [ "${_partition}" == "china" ]; then
+      export AWS_REGION="cn-north-1"
+    elif [ "${_partition}" == "region" ]; then
+      export AWS_REGION="${_region}"
     else
       echo "Must provide AWS partition to build for."
-      echo "Options: commercial govcloud"
+      echo "Options: commercial govcloud china region"
       exit 1
     fi
 

amis/build_ami.sh

@@ -1,7 +1,7 @@
 {
   "variables" : {
-    "cfncluster_version" : "",
-    "cfncluster_cookbook_version" : "",
+    "parallelcluster_version" : "",
+    "parallelcluster_cookbook_version" : "",
     "chef_version" : "",
     "ridley_version" : "",
     "berkshelf_version" : "",
@@ -36,7 +36,7 @@
       "instance_type" : "{{user `instance_type`}}",
       "ssh_username" : "ec2-user",
       "ssh_pty" : true,
-      "ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-amzn-hvm-{{user `build_date`}}",
+      "ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-amzn-hvm-{{user `build_date`}}",
       "subnet_id" : "{{user `subnet_id`}}",
       "vpc_id" : "{{user `vpc_id`}}",
       "skip_region_validation" : true,
@@ -45,11 +45,11 @@
       "ena_support" : true,
       "shutdown_behavior" : "terminate",
       "tags" : {
-        "cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
+        "parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
         "build_date" : "{{user `build_date`}}"
       },
       "run_tags" : {
-        "cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
+        "parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
         "build_date" : "{{user `build_date`}}"
       },
       "launch_block_device_mappings" : [
@@ -89,7 +89,7 @@
       "instance_type" : "{{user `instance_type`}}",
       "ssh_username" : "ec2-user",
       "ssh_pty" : true,
-      "ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-amzn-hvm-{{user `build_date`}}",
+      "ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-amzn-hvm-{{user `build_date`}}",
       "subnet_id" : "{{user `subnet_id`}}",
       "vpc_id" : "{{user `vpc_id`}}",
       "skip_region_validation" : true,
@@ -98,12 +98,12 @@
       "ena_support" : true,
       "shutdown_behavior" : "terminate",
       "tags" : {
-        "cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
+        "parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
         "build_date" : "{{user `build_date`}}"
       },
       "run_tags" : {
         "Name": "Packer Builder {{user `custom_ami_id`}}",
-        "cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
+        "parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
         "build_date" : "{{user `build_date`}}"
       },
       "launch_block_device_mappings" : [
@@ -229,14 +229,14 @@
     {
       "type" : "shell",
       "inline" : [
-        "sudo curl https://s3.amazonaws.com/us-east-1-aws-parallelcluster/cookbooks/aws-parallelcluster-cookbook-{{user `cfncluster_cookbook_version`}}.tgz --silent --location -o /etc/chef/aws-parallelcluster-cookbook.tgz"
+        "sudo curl https://s3.amazonaws.com/us-east-1-aws-parallelcluster/cookbooks/aws-parallelcluster-cookbook-{{user `parallelcluster_cookbook_version`}}.tgz --silent --location -o /etc/chef/aws-parallelcluster-cookbook.tgz"
       ]
     },
     {
       "type" : "shell",
       "inline" : [
         "sudo rm -rf /tmp/* /var/tmp/* && sudo rm -f /root/.ssh/authorized_keys && rm -f ~/.ssh/authorized_keys",
-        "echo aws-parallelcluster-{{user `cfncluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
+        "echo aws-parallelcluster-{{user `parallelcluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
       ]
     },
     {