Skip to content

Commit 7dd5f94

Browse files
author
Sean Smith
committed
Changed cfncluster_version to parallelcluster_version
Signed-off-by: Sean Smith <[email protected]>
1 parent b8a19d5 commit 7dd5f94

File tree

6 files changed

+52
-52
lines changed

6 files changed

+52
-52
lines changed

‎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
{

‎amis/packer_centos6.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" : "centos",
3838
"ssh_pty" : true,
39-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-centos6-hvm-{{user `build_date`}}",
39+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-centos6-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" : "centos",
9191
"ssh_pty" : true,
92-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-centos6-hvm-{{user `build_date`}}",
92+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-centos6-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" : [
@@ -245,14 +245,14 @@
245245
{
246246
"type" : "shell",
247247
"inline" : [
248-
"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"
248+
"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"
249249
]
250250
},
251251
{
252252
"type" : "shell",
253253
"inline" : [
254254
"sudo rm -rf /tmp/* /var/tmp/* && sudo rm -f /root/.ssh/authorized_keys && rm -f ~/.ssh/authorized_keys",
255-
"echo aws-parallelcluster-{{user `cfncluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
255+
"echo aws-parallelcluster-{{user `parallelcluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
256256
]
257257
},
258258
{

‎amis/packer_centos7.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" : "centos",
3838
"ssh_pty" : true,
39-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-centos7-hvm-{{user `build_date`}}",
39+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-centos7-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,20 +89,20 @@
8989
"instance_type" : "{{user `instance_type`}}",
9090
"ssh_username" : "centos",
9191
"ssh_pty" : true,
92-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-centos7-hvm-{{user `build_date`}}",
92+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-centos7-hvm-{{user `build_date`}}",
9393
"subnet_id" : "{{user `subnet_id`}}",
9494
"vpc_id" : "{{user `vpc_id`}}",
9595
"skip_region_validation" : true,
9696
"associate_public_ip_address" : true,
9797
"sriov_support" : true,
9898
"ena_support" : true,
9999
"tags" : {
100-
"cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
100+
"parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
101101
"build_date" : "{{user `build_date`}}"
102102
},
103103
"run_tags" : {
104104
"Name": "Packer Builder {{user `custom_ami_id`}}",
105-
"cfncluster_version" : "aws-parallelcluster-{{user `cfncluster_version`}}",
105+
"parallelcluster_version" : "aws-parallelcluster-{{user `parallelcluster_version`}}",
106106
"build_date" : "{{user `build_date`}}"
107107
},
108108
"launch_block_device_mappings" : [
@@ -243,14 +243,14 @@
243243
{
244244
"type" : "shell",
245245
"inline" : [
246-
"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"
246+
"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"
247247
]
248248
},
249249
{
250250
"type" : "shell",
251251
"inline" : [
252252
"sudo rm -rf /tmp/* /var/tmp/* && sudo rm -f /root/.ssh/authorized_keys && rm -f ~/.ssh/authorized_keys",
253-
"echo aws-parallelcluster-{{user `cfncluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
253+
"echo aws-parallelcluster-{{user `parallelcluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
254254
]
255255
},
256256
{

‎amis/packer_ubuntu1404.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" : "ubuntu",
3838
"ssh_pty" : true,
39-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-ubuntu-1404-lts-hvm-{{user `build_date`}}",
39+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-ubuntu-1404-lts-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" : "ubuntu",
9191
"ssh_pty" : true,
92-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-ubuntu-1404-lts-hvm-{{user `build_date`}}",
92+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-ubuntu-1404-lts-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" : [
@@ -250,14 +250,14 @@
250250
{
251251
"type" : "shell",
252252
"inline" : [
253-
"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"
253+
"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"
254254
]
255255
},
256256
{
257257
"type" : "shell",
258258
"inline" : [
259259
"sudo rm -rf /tmp/* /var/tmp/* && sudo rm -f /root/.ssh/authorized_keys && rm -f ~/.ssh/authorized_keys",
260-
"echo aws-parallelcluster-{{user `cfncluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
260+
"echo aws-parallelcluster-{{user `parallelcluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
261261
]
262262
},
263263
{

‎amis/packer_ubuntu1604.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" : "ubuntu",
3838
"ssh_pty" : true,
39-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-ubuntu-1604-lts-hvm-{{user `build_date`}}",
39+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-ubuntu-1604-lts-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" : "ubuntu",
9191
"ssh_pty" : true,
92-
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `cfncluster_version`}}-ubuntu-1604-lts-hvm-{{user `build_date`}}",
92+
"ami_name" : "{{user `ami_name_prefix` | clean_ami_name}}aws-parallelcluster-{{user `parallelcluster_version`}}-ubuntu-1604-lts-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" : [
@@ -253,14 +253,14 @@
253253
{
254254
"type" : "shell",
255255
"inline" : [
256-
"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"
256+
"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"
257257
]
258258
},
259259
{
260260
"type" : "shell",
261261
"inline" : [
262262
"sudo rm -rf /tmp/* /var/tmp/* && sudo rm -f /root/.ssh/authorized_keys && rm -f ~/.ssh/authorized_keys",
263-
"echo aws-parallelcluster-{{user `cfncluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
263+
"echo aws-parallelcluster-{{user `parallelcluster_version`}} | sudo tee /opt/parallelcluster/.bootstrapped"
264264
]
265265
},
266266
{

‎amis/packer_variables.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"cfncluster_version": "2.1.0",
3-
"cfncluster_cookbook_version": "2.1.0",
2+
"parallelcluster_version": "2.1.0",
3+
"parallelcluster_cookbook_version": "2.1.0",
44
"chef_version": "14.2.0",
55
"ridley_version": "5.1.1",
66
"berkshelf_version": "7.0.4"

0 commit comments

Comments
 (0)