Skip to content

Commit 91c40a0

Browse files
lukeseawalkerlukeseawalker
committed
Reorganize slurm recipes
Signed-off-by: Luca Carrogu <carrogu@amazon.com>
1 parent 420f1a3 commit 91c40a0

File tree

17 files changed

+42
-25
lines changed

17 files changed

+42
-25
lines changed

cookbooks/aws-parallelcluster-byos/recipes/config_computefleet_start_head_node.rb renamed to cookbooks/aws-parallelcluster-byos/recipes/update_computefleet_start_head_node.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-byos
5-
# Recipe:: config_computefleet_start_head_node
5+
# Recipe:: update_computefleet_start_head_node
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

cookbooks/aws-parallelcluster-byos/recipes/config_computefleet_stop_head_node.rb renamed to cookbooks/aws-parallelcluster-byos/recipes/update_computefleet_stop_head_node.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-byos
5-
# Recipe:: config_computefleet_stop_head_node
5+
# Recipe:: update_computefleet_stop_head_node
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

cookbooks/aws-parallelcluster-byos/recipes/config_update_head_node.rb renamed to cookbooks/aws-parallelcluster-byos/recipes/update_head_node.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-byos
5-
# Recipe:: config_update_head_node
5+
# Recipe:: update_head_node
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

‎cookbooks/aws-parallelcluster-config/recipes/finalize.rb‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,4 @@
2424
end
2525

2626
include_recipe 'aws-parallelcluster-byos::finalize' if node['cluster']['scheduler'] == 'byos'
27-
28-
case node['cluster']['node_type']
29-
when 'HeadNode'
30-
include_recipe 'aws-parallelcluster-slurm::head_node_finalize' if node['cluster']['scheduler'] == 'slurm'
31-
when 'ComputeFleet'
32-
include_recipe 'aws-parallelcluster-slurm::compute_finalize' if node['cluster']['scheduler'] == 'slurm'
33-
end
27+
include_recipe 'aws-parallelcluster-slurm::finalize' if node['cluster']['scheduler'] == 'slurm'

‎cookbooks/aws-parallelcluster-slurm/recipes/config.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
case node['cluster']['node_type']
1919
when 'HeadNode'
20-
include_recipe 'aws-parallelcluster-slurm::head_node_config'
20+
include_recipe 'aws-parallelcluster-slurm::config_head_node'
2121
when 'ComputeFleet'
22-
include_recipe 'aws-parallelcluster-slurm::compute_config'
22+
include_recipe 'aws-parallelcluster-slurm::config_compute'
2323
else
2424
raise "node_type must be HeadNode or ComputeFleet"
2525
end

cookbooks/aws-parallelcluster-slurm/recipes/compute_config.rb renamed to cookbooks/aws-parallelcluster-slurm/recipes/config_compute.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-slurm
5-
# Recipe:: compute_config
5+
# Recipe:: config_compute
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

cookbooks/aws-parallelcluster-slurm/recipes/head_node_config.rb renamed to cookbooks/aws-parallelcluster-slurm/recipes/config_head_node.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-slurm
5-
# Recipe:: head_node_config
5+
# Recipe:: config_head_node
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

‎cookbooks/aws-parallelcluster-slurm/recipes/finalize.rb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# frozen_string_literal: true
2+
3+
#
4+
# Cookbook Name:: aws-parallelcluster-slurm
5+
# Recipe:: finalize
6+
#
7+
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
8+
#
9+
# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
10+
# License. A copy of the License is located at
11+
#
12+
# http://aws.amazon.com/apache2.0/
13+
#
14+
# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
15+
# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
18+
case node['cluster']['node_type']
19+
when 'HeadNode'
20+
include_recipe 'aws-parallelcluster-slurm::finalize_head_node'
21+
when 'ComputeFleet'
22+
include_recipe 'aws-parallelcluster-slurm::finalize_compute'
23+
end

cookbooks/aws-parallelcluster-slurm/recipes/compute_finalize.rb renamed to cookbooks/aws-parallelcluster-slurm/recipes/finalize_compute.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-slurm
5-
# Recipe:: compute_finalize
5+
# Recipe:: finalize_compute
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

cookbooks/aws-parallelcluster-slurm/recipes/head_node_finalize.rb renamed to cookbooks/aws-parallelcluster-slurm/recipes/finalize_head_node.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#
44
# Cookbook Name:: aws-parallelcluster-slurm
5-
# Recipe:: head_node_finalize
5+
# Recipe:: finalize_head_node
66
#
77
# Copyright 2013-2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
88
#

0 commit comments

Comments
 (0)