|
15 | 15 | "vpc_id" : "{{env `AWS_VPC_ID`}}",
|
16 | 16 | "ami_name_prefix" : "{{env `AMI_NAME_PREFIX`}}",
|
17 | 17 | "region" : "{{env `AWS_REGION`}}",
|
18 |
| - "custom_ami_id" : "{{env `CUSTOM_AMI_ID`}}" |
| 18 | + "custom_ami_id" : "{{env `CUSTOM_AMI_ID`}}", |
| 19 | + "custom_node_package" : "{{env `PARALLELCLUSTER_NODE_URL`}}", |
| 20 | + "parallelcluster_ref" : "{{env `PARALLELCLUSTER_REF`}}", |
| 21 | + "parallelcluster_cookbook_ref" : "{{env `PARALLELCLUSTER_COOKBOOK_REF`}}", |
| 22 | + "parallelcluster_node_ref" : "{{env `PARALLELCLUSTER_NODE_REF`}}" |
19 | 23 | },
|
20 | 24 | "builders" : [
|
21 | 25 | {
|
|
46 | 50 | "shutdown_behavior" : "terminate",
|
47 | 51 | "tags" : {
|
48 | 52 | "parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
|
49 |
| - "build_date" : "{{user `build_date`}}" |
| 53 | + "build_date" : "{{user `build_date`}}", |
| 54 | + "parallelcluster_ref" : "{{user `parallelcluster_ref`}}", |
| 55 | + "parallelcluster_cookbook_ref" : "{{user `parallelcluster_cookbook_ref`}}", |
| 56 | + "parallelcluster_node_ref" : "{{user `parallelcluster_node_ref`}}" |
50 | 57 | },
|
51 | 58 | "run_tags" : {
|
52 | 59 | "parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
|
53 |
| - "build_date" : "{{user `build_date`}}" |
| 60 | + "build_date" : "{{user `build_date`}}", |
| 61 | + "parallelcluster_ref" : "{{user `parallelcluster_ref`}}", |
| 62 | + "parallelcluster_cookbook_ref" : "{{user `parallelcluster_cookbook_ref`}}", |
| 63 | + "parallelcluster_node_ref" : "{{user `parallelcluster_node_ref`}}" |
54 | 64 | },
|
55 | 65 | "launch_block_device_mappings" : [
|
56 | 66 | {
|
57 | 67 | "device_name" : "/dev/sda1",
|
58 |
| - "volume_size" : "15", |
| 68 | + "volume_size" : "17", |
59 | 69 | "volume_type" : "gp2",
|
60 | 70 | "delete_on_termination" : true
|
61 | 71 | },
|
|
216 | 226 | "cfncluster" : {
|
217 | 227 | "nvidia" : {
|
218 | 228 | "enabled" : "{{user `nvidia_enabled`}}"
|
219 |
| - } |
| 229 | + }, |
| 230 | + "custom_node_package" : "{{user `custom_node_package`}}" |
220 | 231 | }
|
221 | 232 | },
|
222 | 233 | "remote_cookbook_paths" : [
|
|
251 | 262 | "sudo pip install /tmp/aws-cfn-bootstrap-latest.tar.gz"
|
252 | 263 | ]
|
253 | 264 | },
|
254 |
| - { |
255 |
| - "type" : "shell", |
256 |
| - "inline_shebang" : "/bin/bash -e", |
257 |
| - "inline" : [ |
258 |
| - "region=\"{{user `region`}}\"", |
259 |
| - "bucket=\"s3.${region}.amazonaws.com\"", |
260 |
| - "[[ ${region} =~ ^cn- ]] && bucket=\"s3.${region}.amazonaws.com.cn\"", |
261 |
| - "sudo curl --retry 3 https://${bucket}/${region}-aws-parallelcluster/cookbooks/aws-parallelcluster-cookbook-{{user `parallelcluster_cookbook_version`}}.tgz --silent --location -o /etc/chef/aws-parallelcluster-cookbook.tgz" |
262 |
| - ] |
263 |
| - }, |
264 | 265 | {
|
265 | 266 | "type" : "shell",
|
266 | 267 | "inline" : [
|
|
0 commit comments