Skip to content

Commit e568ae2

Browse files
committed
Remove in_place_update_on_fleet_enabled chef attribute
1 parent 0c05f11 commit e568ae2

File tree

6 files changed

+2
-61
lines changed

6 files changed

+2
-61
lines changed

cookbooks/aws-parallelcluster-platform/recipes/config/supervisord_config.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
dcv_port: node['cluster']['dcv_port'],
3333
dcv_auth_certificate: node['cluster']['dcv']['authenticator']['certificate'],
3434
dcv_auth_private_key: node['cluster']['dcv']['authenticator']['private_key'],
35-
dcv_auth_user: node['cluster']['dcv']['authenticator']['user'],
36-
cfnhup_enabled: cfnhup_enabled?
35+
dcv_auth_user: node['cluster']['dcv']['authenticator']['user']
3736
)
3837
end

cookbooks/aws-parallelcluster-shared/attributes/cluster.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,3 @@
3838

3939
# Default NFS mount options
4040
default['cluster']['nfs']['hard_mount_options'] = 'hard,_netdev,noatime'
41-
42-
# Cluster Updates
43-
default['cluster']['in_place_update_on_fleet_enabled'] = 'true'

cookbooks/aws-parallelcluster-shared/libraries/helpers.rb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,3 @@ def wait_sync_file(path)
106106
timeout 5
107107
end
108108
end
109-
110-
def cfnhup_enabled?
111-
# cfn-hup is always enabled on the head node, as it is required to perform cluster updates.
112-
# cfn-hup can be disabled on compute nodes and login nodes, limiting the cluster update in the sense that
113-
# live updates on compute and login nodes are not possible.
114-
node['cluster']['node_type'] == 'HeadNode' || node['cluster']['in_place_update_on_fleet_enabled'] == 'true'
115-
end
116-
117-
def cluster_readiness_check_on_update_enabled?
118-
node['cluster']['in_place_update_on_fleet_enabled'] == 'true'
119-
end

cookbooks/aws-parallelcluster-shared/spec/unit/libraries/helpers_spec.rb

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

cookbooks/aws-parallelcluster-slurm/recipes/update/update_head_node.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def update_nodes_in_queue(strategy, queues)
280280

281281
chef_sleep '15'
282282

283-
wait_cluster_ready if cluster_readiness_check_on_update_enabled?
283+
wait_cluster_ready
284284

285285
execute 'start clustermgtd' do
286286
command "#{cookbook_virtualenv_path}/bin/supervisorctl start clustermgtd"

cookbooks/aws-parallelcluster-slurm/spec/unit/recipes/update_head_node_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
allow_any_instance_of(Object).to receive(:are_mount_or_unmount_required?).and_return(are_mount_or_unmount_required)
1616
allow_any_instance_of(Object).to receive(:dig).and_return(true)
1717
allow_any_instance_of(Object).to receive(:cookbook_virtualenv_path).and_return(cookbook_venv_path)
18-
allow_any_instance_of(Object).to receive(:cluster_readiness_check_on_update_enabled?).and_return(true)
1918
RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
2019

2120
node.override['cluster']['stack_name'] = cluster_name
@@ -81,7 +80,6 @@
8180
allow_any_instance_of(Object).to receive(:are_mount_or_unmount_required?).and_return(false)
8281
allow_any_instance_of(Object).to receive(:dig).and_return(true)
8382
allow_any_instance_of(Object).to receive(:cookbook_virtualenv_path).and_return(cookbook_venv_path)
84-
allow_any_instance_of(Object).to receive(:cluster_readiness_check_on_update_enabled?).and_return(false)
8583
RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
8684

8785
node.override['cluster']['stack_name'] = cluster_name

0 commit comments

Comments
 (0)