Revert #1092 and #1095

Signed-off-by: Luca Carrogu <carrogu@amazon.com>

Author: lukeseawalker

recipes/head_node_slurm_config.rb

@@ -81,6 +81,14 @@
   retry_delay 5
 end
 
+execute 'initialize cluster config hash in DynamoDB' do
+  command "#{node['cluster']['cookbook_virtualenv_path']}/bin/aws dynamodb put-item --table-name #{node['cluster']['ddb_table']}"\
+          " --item '{\"Id\": {\"S\": \"CLUSTER_CONFIG_WITH_IMPLIED_VALUES\"}, \"Version\": {\"S\": \"#{node['cluster']['cluster_config_version']}\"}}' --region #{node['cluster']['region']}"
+  retries 3
+  retry_delay 5
+  not_if { node['cluster']['cluster_config_version'].nil? }
+end
+
 execute 'initialize compute fleet status in DynamoDB' do
   # Initialize the status of the compute fleet in the DynamoDB table. Set it to RUNNING.
   command "#{node['cluster']['cookbook_virtualenv_path']}/bin/aws dynamodb put-item --table-name #{node['cluster']['ddb_table']}"\

recipes/update_head_node_slurm.rb

@@ -63,3 +63,11 @@
     command "cp #{updated_cluster_config_path} #{node['cluster']['cluster_config_path']}"
   end
 end
+
+execute 'update cluster config hash in DynamoDB' do
+  command "#{node['cluster']['cookbook_virtualenv_path']}/bin/aws dynamodb put-item --table-name #{node['cluster']['ddb_table']}"\
+          " --item '{\"Id\": {\"S\": \"CLUSTER_CONFIG_WITH_IMPLIED_VALUES\"}, \"Version\": {\"S\": \"#{node['cluster']['cluster_config_version']}\"}}' --region #{node['cluster']['region']}"
+  retries 3
+  retry_delay 5
+  not_if { node['cluster']['cluster_config_version'].nil? }
+end

templates/default/parallelcluster_supervisord.conf.erb

@@ -3,13 +3,14 @@
 <% case node['cluster']['node_type'] -%>
 <%# HeadNode -%>
 <% when 'HeadNode' -%>
+<% if node['cluster']['scheduler'] == 'slurm' -%>
 [program:cfn-hup]
 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"
 # The following are needed because cfn-hup starts as a daemon
 exitcodes = 0
 autorestart = unexpected
 startsecs = 0
-<% if node['cluster']['scheduler'] == 'slurm' -%>
+
 [program:clustermgtd]
 command = <%= node['cluster']['node_virtualenv_path'] %>/bin/clustermgtd
 user = <%= node['cluster']['cluster_admin_user'] %>