[Nvidia-Imex] Use nvidia-imex shared directory for Inspec and configuration files

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-platform/attributes/platform.rb

@@ -22,6 +22,9 @@
   default['cluster']['nvidia']['driver_version'] = '550.127.08'
 end
 
+# Nvidia-imex
+default['cluster']['nvidia']['imex']['shared_dir'] = "#{node['cluster']['shared_dir']}/nvidia-imex"
+
 # DCV
 default['cluster']['dcv']['authenticator']['user'] = "dcvextauth"
 default['cluster']['dcv']['authenticator']['user_id'] = node['cluster']['reserved_base_uid'] + 3

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

@@ -24,16 +24,16 @@
     action :add
   end
 
-  directory "#{node['cluster']['shared_dir']}/#{nvidia_imex_service}"
+  directory node['cluster']['nvidia']['imex']['shared_dir']
 
-  template "#{node['cluster']['shared_dir']}/#{nvidia_imex_service}/config.cfg" do
+  template "#{node['cluster']['nvidia']['imex']['shared_dir']}/config.cfg" do
     source 'nvidia-imex/nvidia-imex-config.erb'
     owner 'root'
     group 'root'
     mode '0755'
   end
 
-  template "#{node['cluster']['shared_dir']}/#{nvidia_imex_service}/nodes_config.cfg" do
+  template "#{node['cluster']['nvidia']['imex']['shared_dir']}/nodes_config.cfg" do
     source 'nvidia-imex/nvidia-imex-nodes.erb'
     owner 'root'
     group 'root'

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

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-shared_dir = "SHARED_DIR"
 nvidia_version = "1.2.3"
-nvidia_imex_shared_dir = "#{shared_dir}/nvidia-imex"
+nvidia_imex_shared_dir = "SHARED_DIR/nvidia-imex"
 imex_binary = '/usr/bin/nvidia-imex'
 imex_ctl_binary = '/usr/bin/nvidia-imex-ctl'
 
@@ -189,7 +188,7 @@ def self.configure(chef_run)
         cached(:node) { chef_run.node }
 
         before do
-          chef_run.node.override['cluster']['shared_dir'] = shared_dir
+          chef_run.node.override['cluster']['nvidia']['imex']['shared_dir'] = nvidia_imex_shared_dir
           chef_run.node.override['cluster']['region'] = 'aws_region'
           chef_run.node.override['cluster']['nvidia']['driver_version'] = nvidia_version
           ConvergeNvidiaImex.install(chef_run)

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

@@ -86,7 +86,7 @@ SERVER_PORT=50000
 #   Possible Values:
 #       Full path/filename string (max length of 256).
 #       Default Value: /etc/nvidia-imex/nodes_config.cfg
-IMEX_NODE_CONFIG_FILE=<%= node['cluster']['shared_dir'] %>/nodes_config.cfg
+IMEX_NODE_CONFIG_FILE=<%= node['cluster']['nvidia']['imex']['shared_dir'] %>/nodes_config.cfg
 
 #  Description: Name of the network interface used for communication.
 #               OPTIONAL - If empty, network interface will be determined by matching bind IP to

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

@@ -10,7 +10,7 @@ PrivateTmp=false
 Type=forking
 TimeoutStartSec=infinity
 
-ExecStart=/usr/bin/nvidia-imex -c <%= node['cluster']['shared_dir'] %>/nvidia-imex/config.cfg
+ExecStart=/usr/bin/nvidia-imex -c <%= node['cluster']['nvidia']['imex']['shared_dir'] %>/config.cfg
 
 LimitCORE=infinity
 

cookbooks/aws-parallelcluster-platform/test/controls/nvidia_imex_spec.rb

@@ -13,12 +13,6 @@
   only_if { ['yes', true, 'true'].include?(node['cluster']['nvidia']['enabled']) && !os_properties.alinux2? }
 
   nvidia_imex_service = 'nvidia-imex'
-
-  describe package("#{node['cluster']['nvidia']['imex']['package']}") do
-    it { should be_installed }
-    its('version') { should match /#{node['cluster']['nvidia']['imex']['version']}/ }
-  end
-
   ["/usr/bin/#{nvidia_imex_service}", "/usr/bin/#{nvidia_imex_service}-ctl"].each do |path|
     describe file(path) do
       it { should exist }
@@ -28,15 +22,34 @@
     end
   end
 
-  nvidia_imex_dir = "#{node['cluster']['shared_dir']}/#{nvidia_imex_service}"
+  nvidia_imex_dir = "#{node['cluster']['nvidia']['imex']['shared_dir']}"
 
-  ["#{nvidia_imex_dir}/config.cfg", "#{nvidia_imex_dir}/nodes_config.cfg"].each do |conf_files|
-    describe file(conf_files) do
-      it { should exist }
-      its('owner') { should eq 'root' }
-      its('group') { should eq 'root' }
-      its('mode') { should cmp '0755' }
-    end
+  describe file("#{nvidia_imex_dir}/config.cfg") do
+    it { should exist }
+    its('owner') { should eq 'root' }
+    its('group') { should eq 'root' }
+    its('mode') { should cmp '0755' }
+    its('content') { should match %r{/IMEX_NODE_CONFIG_FILE=#{nvidia_imex_dir}/nodes_config.cfg/} }
+  end
+
+  describe file("#{nvidia_imex_dir}/nodes_config.cfg") do
+    it { should exist }
+    its('owner') { should eq 'root' }
+    its('group') { should eq 'root' }
+    its('mode') { should cmp '0755' }
+  end
+
+  describe file("/etc/systemd/system/#{nvidia_imex_service}.service") do
+    it { should exist }
+    its('owner') { should eq 'root' }
+    its('group') { should eq 'root' }
+    its('mode') { should cmp '0644' }
+    its('content') { should match %r{ExecStart=/usr/bin/nvidia-imex -c #{nvidia_imex_dir}/config.cfg} }
+  end
+
+  describe package("#{node['cluster']['nvidia']['imex']['package']}") do
+    it { should be_installed }
+    its('version') { should match /#{node['cluster']['nvidia']['imex']['version']}/ }
   end
 end