Merge branch 'develop' into wip/mgiacomo/3140/fix-queue-updated-condition-0812-2

Author: himani2411

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/partial/_nvidia_imex_common.rb

@@ -39,17 +39,15 @@
       owner 'root'
       group 'root'
       mode '0755'
-      action :create
-      not_if { file_exists_and_cluster_update?(nvidia_imex_nodes_conf_file) }
+      action :create_if_missing
     end
 
     template nvidia_imex_main_conf_file do
       source 'nvidia-imex/nvidia-imex-config.erb'
       owner 'root'
       group 'root'
       mode '0755'
-      action :create
-      not_if { file_exists_and_cluster_update?(nvidia_imex_main_conf_file) }
+      action :create_if_missing
       variables(imex_nodes_config_file_path: nvidia_imex_nodes_conf_file)
     end
 
@@ -93,10 +91,6 @@ def nvidia_enabled_or_installed?
   nvidia_enabled? || nvidia_installed?
 end
 
-def file_exists_and_cluster_update?(file_path)
-  ::File.exist?(file_path) && !are_queues_updated?
-end
-
 def nvidia_imex_main_conf_file
   "#{node['cluster']['nvidia']['imex']['shared_dir']}/config_#{node['cluster']['launch_template_id']}.cfg"
 end

cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_imex_spec.rb

@@ -336,12 +336,12 @@ def self.configure(chef_run)
 
             if (platform == 'amazon' && version == '2') || %w(HeadNode LoginNode).include?(node_type)
               it 'does not configure nvidia-imex' do
-                is_expected.not_to create_template("#{nvidia_imex_shared_dir}/nodes_config_#{launch_template_id}.cfg")
+                is_expected.not_to create_if_missing_template("#{nvidia_imex_shared_dir}/nodes_config_#{launch_template_id}.cfg")
                   .with(source: 'nvidia-imex/nvidia-imex-nodes.erb')
                   .with(user: 'root')
                   .with(group: 'root')
                   .with(mode: '0755')
-                is_expected.not_to create_template("#{nvidia_imex_shared_dir}/config_#{launch_template_id}.cfg")
+                is_expected.not_to create_if_missing_template("#{nvidia_imex_shared_dir}/config_#{launch_template_id}.cfg")
                   .with(source: 'nvidia-imex/nvidia-imex-config.erb')
                   .with(user: 'root')
                   .with(group: 'root')
@@ -357,12 +357,12 @@ def self.configure(chef_run)
               end
             else
               it 'it starts nvidia-imex service' do
-                is_expected.to create_template("#{nvidia_imex_shared_dir}/nodes_config_#{launch_template_id}.cfg")
+                is_expected.to create_if_missing_template("#{nvidia_imex_shared_dir}/nodes_config_#{launch_template_id}.cfg")
                   .with(source: 'nvidia-imex/nvidia-imex-nodes.erb')
                   .with(user: 'root')
                   .with(group: 'root')
                   .with(mode: '0755')
-                is_expected.to create_template("#{nvidia_imex_shared_dir}/config_#{launch_template_id}.cfg")
+                is_expected.to create_if_missing_template("#{nvidia_imex_shared_dir}/config_#{launch_template_id}.cfg")
                   .with(source: 'nvidia-imex/nvidia-imex-config.erb')
                   .with(user: 'root')
                   .with(group: 'root')

cookbooks/aws-parallelcluster-platform/templates/nvidia-imex/nvidia-imex-nodes.erb

@@ -1,3 +1,10 @@
 ## Please replace below fake IP's with correct IP address of launched instances in Gb200 Capacity Block
-172.31.51.93
-172.31.48.43
+0.0.0.0
+0.0.0.0
+0.0.0.0
+0.0.0.0
+0.0.0.0
+0.0.0.0
+0.0.0.0
+0.0.0.0
+0.0.0.0