[DFSM] Make supervisord start cfn-hup on compute nodes.

Signed-off-by: Giacomo Marciani <[email protected]>
hgreebe · Jan 16, 2024 · b140529 · b140529
1 parent ef5d05f
commit b140529
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/recipes/supervisord_config_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/recipes/supervisord_config_spec.rb
@@ -29,6 +29,7 @@
 
         it 'has the correct content' do
           is_expected.to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
+            .with_content("[program:cfn-hup]")
             .with_content("[program:clustermgtd]")
             .with_content("[program:clusterstatusmgtd]")
             .with_content("[program:pcluster_dcv_authenticator]")
@@ -69,6 +70,7 @@
 
         it 'has the correct content' do
           is_expected.to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
+            .with_content("[program:cfn-hup]")
             .with_content("[program:computemgtd]")
 
           is_expected.not_to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
@@ -91,6 +93,7 @@
             .with_content("[program:loginmgtd]")
 
           is_expected.not_to render_file('/etc/parallelcluster/parallelcluster_supervisord.conf')
+            .with_content("[program:cfn-hup]")
             .with_content("[program:pcluster_dcv_authenticator]")
         end
       end

diff --git a/...s/aws-parallelcluster-platform/templates/supervisord/parallelcluster_supervisord.conf.erb b/...s/aws-parallelcluster-platform/templates/supervisord/parallelcluster_supervisord.conf.erb
@@ -1,17 +1,22 @@
 # Generated by Chef for AWS ParallelCluster <%= node['cluster']['node_type'] -%>
 # Local modifications could be overwritten.
+<%# HeadNode, ComputeFleet -%>
 <% case node['cluster']['node_type'] -%>
-<%# HeadNode -%>
-<% when 'HeadNode' -%>
+<% when 'HeadNode', 'ComputeFleet' -%>
 [program:cfn-hup]
 command = <%= node['cluster']['scripts_dir']%>/cfn-hup-runner.sh
 autorestart = true
 redirect_stderr = true
 stdout_logfile = /var/log/parallelcluster/cfn-hup-runner.log
 stdout_logfile_maxbytes = 1MB
 <% if @region.start_with?('us-iso') -%>
-environment = AWS_CA_BUNDLE="<%= @aws_ca_bundle %>"
+  environment = AWS_CA_BUNDLE="<%= @aws_ca_bundle %>"
 <% end -%>
+<% end -%>
+
+<% case node['cluster']['node_type'] -%>
+<%# HeadNode -%>
+<% when 'HeadNode' -%>
 <% if node['cluster']['scheduler'] == 'slurm' -%>
 [program:clustermgtd]
 command = <%= node_virtualenv_path %>/bin/clustermgtd