Skip to content

Commit c39e5b2

Browse files
committed
Remove lambda custom resource logic to signal stack update
Stack update is signaled through wait condition and cfn-hup Signed-off-by: Luca Carrogu <[email protected]>
1 parent 48fc8ae commit c39e5b2

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

recipes/head_node_slurm_config.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@
8181
retry_delay 5
8282
end
8383

84-
execute 'initialize cluster config hash in DynamoDB' do
85-
command "#{node['cluster']['cookbook_virtualenv_path']}/bin/aws dynamodb put-item --table-name #{node['cluster']['ddb_table']}"\
86-
" --item '{\"Id\": {\"S\": \"CLUSTER_CONFIG_WITH_IMPLIED_VALUES\"}, \"Version\": {\"S\": \"#{node['cluster']['cluster_config_version']}\"}}' --region #{node['cluster']['region']}"
87-
retries 3
88-
retry_delay 5
89-
not_if { node['cluster']['cluster_config_version'].nil? }
90-
end
91-
9284
execute 'initialize compute fleet status in DynamoDB' do
9385
# Initialize the status of the compute fleet in the DynamoDB table. Set it to RUNNING.
9486
command "#{node['cluster']['cookbook_virtualenv_path']}/bin/aws dynamodb put-item --table-name #{node['cluster']['ddb_table']}"\

recipes/update_head_node_slurm.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,3 @@
6363
command "cp #{updated_cluster_config_path} #{node['cluster']['cluster_config_path']}"
6464
end
6565
end
66-
67-
execute 'update cluster config hash in DynamoDB' do
68-
command "#{node['cluster']['cookbook_virtualenv_path']}/bin/aws dynamodb put-item --table-name #{node['cluster']['ddb_table']}"\
69-
" --item '{\"Id\": {\"S\": \"CLUSTER_CONFIG_WITH_IMPLIED_VALUES\"}, \"Version\": {\"S\": \"#{node['cluster']['cluster_config_version']}\"}}' --region #{node['cluster']['region']}"
70-
retries 3
71-
retry_delay 5
72-
not_if { node['cluster']['cluster_config_version'].nil? }
73-
end

templates/default/parallelcluster_supervisord.conf.erb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
<% case node['cluster']['node_type'] -%>
44
<%# HeadNode -%>
55
<% when 'HeadNode' -%>
6-
<% if node['cluster']['scheduler'] == 'slurm' -%>
76
[program:cfn-hup]
87
command = bash -c "[ -f /etc/profile.d/proxy.sh ] && . /etc/profile.d/proxy.sh; <%= node['cluster']['cookbook_virtualenv_path'] %>/bin/python <%= node['cluster']['cookbook_virtualenv_path'] %>/bin/cfn-hup"
98
# The following are needed because cfn-hup starts as a daemon
109
exitcodes = 0
1110
autorestart = unexpected
1211
startsecs = 0
13-
12+
<% if node['cluster']['scheduler'] == 'slurm' -%>
1413
[program:clustermgtd]
1514
command = <%= node['cluster']['node_virtualenv_path'] %>/bin/clustermgtd
1615
user = <%= node['cluster']['cluster_admin_user'] %>

0 commit comments

Comments
 (0)