Remove SQS and compute_ready script references

Cherry pick of:
e5d68e2

with additional changes.

Signed-off-by: Enrico Usai <[email protected]>

Author: Enrico Usai

.kitchen.yml

@@ -83,7 +83,6 @@ suites:
         cfn_ephemeral_dir: <%= ENV['CFN_EPHEMERAL_DIR'] %>
         cfn_shared_dir: <%= ENV['CFN_SHARED_DIR'] %>
         cfn_cluster_user: <%= ENV['CFN_CLUSTER_USER'] %>
-        cfn_sqs_queue: <%= ENV['CFN_SQS_QUEUE'] %>
         cfn_ddb_table: <%= ENV['CFN_DDB_TABLE'] %>
         # cfn_base_os is one of the base OSs supported by pcluster
         cfn_base_os: <%= ENV['CFN_BASE_OS'] %>
@@ -118,7 +117,6 @@ suites:
         cfn_ephemeral_dir: <%= ENV['CFN_EPHEMERAL_DIR'] %>
         cfn_shared_dir: <%= ENV['CFN_SHARED_DIR'] %>
         cfn_cluster_user: <%= ENV['CFN_CLUSTER_USER'] %>
-        cfn_sqs_queue: <%= ENV['CFN_SQS_QUEUE'] %>
         cfn_ddb_table: <%= ENV['CFN_DDB_TABLE'] %>
         # cfn_base_os is one of the base OSs supported by pcluster
         cfn_base_os: <%= ENV['CFN_BASE_OS'] %>
@@ -150,7 +148,6 @@ suites:
         cfn_ephemeral_dir: <%= ENV['CFN_EPHEMERAL_DIR'] %>
         cfn_shared_dir: <%= ENV['CFN_SHARED_DIR'] %>
         cfn_cluster_user: <%= ENV['CFN_CLUSTER_USER'] %>
-        cfn_sqs_queue: <%= ENV['CFN_SQS_QUEUE'] %>
         cfn_master: <%= ENV['CFN_MASTER'] %>
         cfn_master_private_ip: <%= ENV['CFN_MASTER_PRIVATE_IP'] %>
         # cfn_base_os is one of the base OSs supported by pcluster

attributes/default.rb

@@ -400,7 +400,6 @@
 # ParallelCluster internal variables (also in /etc/parallelcluster/cfnconfig)
 default['cfncluster']['cfn_region'] = 'us-east-1'
 default['cfncluster']['stack_name'] = nil
-default['cfncluster']['cfn_sqs_queue'] = nil
 default['cfncluster']['cfn_ddb_table'] = nil
 default['cfncluster']['cfn_node_type'] = nil
 default['cfncluster']['cfn_preinstall'] = 'NONE'

recipes/finalize.rb

@@ -25,12 +25,5 @@
 when 'MasterServer'
   include_recipe 'aws-parallelcluster::head_node_slurm_finalize' if node['cfncluster']['cfn_scheduler'] == 'slurm'
 when 'ComputeFleet'
-  if node['cfncluster']['cfn_scheduler'] == 'slurm'
-    include_recipe 'aws-parallelcluster::compute_slurm_finalize'
-  else
-    execute "compute_ready" do
-      command "/opt/parallelcluster/scripts/compute_ready"
-      environment('PATH' => '/usr/local/bin:/usr/bin/:$PATH')
-    end
-  end
+  include_recipe 'aws-parallelcluster::compute_slurm_finalize'
 end

recipes/prep_env.rb

@@ -66,13 +66,6 @@
   mode "0755"
 end
 
-template '/opt/parallelcluster/scripts/compute_ready' do
-  source 'compute_ready.erb'
-  owner "root"
-  group "root"
-  mode "0755"
-end
-
 include_recipe "aws-parallelcluster::setup_python"
 
 # Install cloudwatch, write configuration and start it.

templates/default/cfnconfig.erb

@@ -14,7 +14,6 @@ cfn_proxy=<%= node['cfncluster']['cfn_proxy'] %>
 cfn_node_type=<%= node['cfncluster']['cfn_node_type'] %>
 cfn_cluster_user=<%= node['cfncluster']['cfn_cluster_user'] %>
 <% if node['cfncluster']['cfn_node_type'] == 'ComputeFleet' -%>
-cfn_sqs_queue=<%= node['cfncluster']['cfn_sqs_queue'] %>
 cfn_master=<%= node['cfncluster']['cfn_master'] %>
 cfn_master_private_ip=<%= node['cfncluster']['cfn_master_private_ip'] %>
 cfn_scheduler_queue_name=<%= node['cfncluster']['scheduler_queue_name'] %>