Skip to content

Commit e687a18

Browse files
author
Sean Smith
authored
Merge pull request #243 from sean-smith/merge-master
Release 2.1.0
2 parents a637db1 + 230b1ba commit e687a18

19 files changed

+430
-375
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ aws-parallelcluster-cookbook CHANGELOG
33

44
This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
55

6+
2.1.0
7+
-----
8+
9+
- EFS support
10+
- RAID support
11+
12+
2.0.2
13+
-----
14+
15+
- Fix issue with jq on ubuntu1404 and centos6. Now using version 1.4
16+
- Fix dependency issue with AWS CLI package on ubuntu1404
17+
618
2.0.0
719
-----
820

LICENSE.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

amis/build_ami.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414
# Usage: build_ami.sh --os <os> --region <region> --partition <partition> [--public] [--custom] [--build-date <build-date>]
1515
# os: the os to build (supported values: all|centos6|centos7|alinux|ubuntu1404|ubuntu1604)
16-
# partition: partition to build in (supported values: commercial|govcloud)
16+
# partition: partition to build in (supported values: commercial|govcloud|china)
1717
# region: region to copy ami too (supported values: all|us-east-1|us-gov-west-1|...)
1818
# custom: specifies to create the AMI from a custom AMI-id, which must be specified by variable CUSTOM_AMI_ID in the environment (optional)
1919
# public: specifies AMIs visibility (optional, default is private)
@@ -131,9 +131,13 @@ check_options() {
131131
export AWS_REGION="us-east-1"
132132
elif [ "${_partition}" == "govcloud" ]; then
133133
export AWS_REGION="us-gov-west-1"
134+
elif [ "${_partition}" == "china" ]; then
135+
export AWS_REGION="cn-north-1"
136+
elif [ "${_partition}" == "region" ]; then
137+
export AWS_REGION="${_region}"
134138
else
135139
echo "Must provide AWS partition to build for."
136-
echo "Options: commercial govcloud"
140+
echo "Options: commercial govcloud china region"
137141
exit 1
138142
fi
139143

amis/packer_alinux.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"variables" : {
3-
"cfncluster_version" : "",
4-
"cfncluster_cookbook_version" : "",
3+
"parallelcluster_version" : "",
4+
"parallelcluster_cookbook_version" : "",
55
"chef_version" : "",
66
"ridley_version" : "",
77
"berkshelf_version" : "",
@@ -36,7 +36,7 @@
3636
"instance_type" : "{{user `instance_type`}}",
3737
"ssh_username" : "ec2-user",
3838
"ssh_pty" : true,
39-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-amzn-hvm-{{user `build_date`}}",
39+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-amzn-hvm-{{user `build_date`}}",
4040
"subnet_id" : "{{user `subnet_id`}}",
4141
"vpc_id" : "{{user `vpc_id`}}",
4242
"skip_region_validation" : true,
@@ -45,11 +45,11 @@
4545
"ena_support" : true,
4646
"shutdown_behavior" : "terminate",
4747
"tags" : {
48-
"cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
48+
"parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
4949
"build_date" : "{{user `build_date`}}"
5050
},
5151
"run_tags" : {
52-
"cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
52+
"parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
5353
"build_date" : "{{user `build_date`}}"
5454
},
5555
"launch_block_device_mappings" : [
@@ -89,7 +89,7 @@
8989
"instance_type" : "{{user `instance_type`}}",
9090
"ssh_username" : "ec2-user",
9191
"ssh_pty" : true,
92-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-amzn-hvm-{{user `build_date`}}",
92+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-amzn-hvm-{{user `build_date`}}",
9393
"subnet_id" : "{{user `subnet_id`}}",
9494
"vpc_id" : "{{user `vpc_id`}}",
9595
"skip_region_validation" : true,
@@ -98,12 +98,12 @@
9898
"ena_support" : true,
9999
"shutdown_behavior" : "terminate",
100100
"tags" : {
101-
"cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
101+
"parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
102102
"build_date" : "{{user `build_date`}}"
103103
},
104104
"run_tags" : {
105105
"Name": "Packer Builder {{user `custom_ami_id`}}",
106-
"cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
106+
"parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
107107
"build_date" : "{{user `build_date`}}"
108108
},
109109
"launch_block_device_mappings" : [
@@ -229,14 +229,14 @@
229229
{
230230
"type" : "shell",
231231
"inline" : [
232-
"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"
232+
"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"
233233
]
234234
},
235235
{
236236
"type" : "shell",
237237
"inline" : [
238238
"sudo rm -rf /tmp/* /var/tmp/* && sudo rm -f /root/.ssh/authorized_keys && rm -f ~/.ssh/authorized_keys",
239-
"echo aws-parallelcluster-{{user `cfncluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
239+
"echo aws-parallelcluster-{{user `parallelcluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
240240
]
241241
},
242242
{

0 commit comments

Comments
 (0)