Adding it as condition

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-computefleet/templates/compute_fleet_status/is_fleet_ready.erb

@@ -1,7 +1,16 @@
 #!/bin/bash
 
-sinfo_output=$(<%= node['cluster']['slurm']['install_dir'] %>/bin/sinfo -h -o '%N %t' | grep -v -E '(idle|alloc|mix|maint)$')
-while IFS= read -r line; do
-    nodelist=$(echo "$line" | awk '{print $1}')
-    <%= node['cluster']['slurm']['install_dir'] %>/bin/scontrol show hostnames "$nodelist" | { grep -E '^[a-z0-9\-]+\-st\-[a-z0-9\-]+\-[0-9]+.*' || true; }
-done <<< "$sinfo_output"
+
+
+cluster_static_node_count=$1
+if [[ -z "$cluster_static_node_count" ]]; then
+ cluster_static_node_count=1
+fi
+
+if [[ "$cluster_static_node_count" -ge "1" ]]; then
+  sinfo_output=$(<%= node['cluster']['slurm']['install_dir'] %>/bin/sinfo -h -o '%N %t' | grep -v -E '(idle|alloc|mix|maint)$')
+  while IFS= read -r line; do
+      nodelist=$(echo "$line" | awk '{print $1}')
+      <%= node['cluster']['slurm']['install_dir'] %>/bin/scontrol show hostnames "$nodelist" | { grep -E '^[a-z0-9\-]+\-st\-[a-z0-9\-]+\-[0-9]+.*' || true; }
+  done <<< "$sinfo_output"
+fi

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

@@ -213,15 +213,14 @@ def check_for_protected_mode(fleet_status_command) # rubocop:disable Lint/Nested
       # sinfo -h -o '%N %t'
       # queue-0-dy-compute-resource-g4dn-0-[1-10],queue-1-dy-compute-resource-g4dn-1-[1-10] idle~
       # queue-2-dy-compute-resource-g4dn-2-[1-10],queue-3-dy-compute-resource-g4dn-3-[1-10] idle
-      until shell_out!("/bin/bash -c /usr/local/bin/is_fleet_ready.sh").stdout.strip.empty?
-        check_for_protected_mode(fleet_status_command)
+      until shell_out!("/bin/bash -c /usr/local/bin/is_fleet_ready.sh #{get_static_node_count.to_i}").stdout.strip.empty?
+        check_for_protected_mode(fleet_status_command) #TODO Separate check for dynamic Nodes during dfsmv2
 
         Chef::Log.info("Waiting for static fleet capacity provisioning")
         sleep(15)
       end
       Chef::Log.info("Static fleet capacity is ready")
     end
-    only_if { get_static_node_count.to_i > 0 }
   end
 end