The scrun.lua is now part of configless deployment

treydock · Mar 22, 2024 · cd582a2 · cd582a2
1 parent f759511
commit cd582a2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 26 deletions.
diff --git a/manifests/common/config.pp b/manifests/common/config.pp
@@ -152,20 +152,20 @@
         File["${slurm::conf_dir}/cli_filter.lua"] ~> Exec['scontrol reconfig']
       }
     }
-  }
 
-  if ($slurm::client or $slurm::slurmctld) and ($slurm::scrun_lua_source or $slurm::scrun_lua_content) {
-    file { "${slurm::conf_dir}/scrun.lua":
-      ensure  => 'file',
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      source  => $slurm::scrun_lua_source,
-      content => $slurm::scrun_lua_content,
-    }
+    if $slurm::scrun_lua_source or $slurm::scrun_lua_content {
+      file { "${slurm::conf_dir}/scrun.lua":
+        ensure  => 'file',
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0644',
+        source  => $slurm::scrun_lua_source,
+        content => $slurm::scrun_lua_content,
+      }
 
-    if $slurm::slurmctld and $slurm::enable_configless {
-      File["${slurm::conf_dir}/scrun.lua"] ~> Exec['scontrol reconfig']
+      if $slurm::slurmctld and $slurm::enable_configless {
+        File["${slurm::conf_dir}/scrun.lua"] ~> Exec['scontrol reconfig']
+      }
     }
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -218,7 +218,7 @@
   Boolean $install_pam            = true,
 
   # Source install
-  String $version = '23.11.3',
+  String $version = '23.11.5',
   Array $source_dependencies = [],
   Array $configure_flags = [],
   Boolean $source_install_manage_alternatives = true,

diff --git a/spec/shared_examples/slurm_common_config.rb b/spec/shared_examples/slurm_common_config.rb
@@ -234,18 +234,14 @@
     let(:param_override) { { scrun_lua_source: 'puppet:///scrun.lua' } }
 
     it do
-      if client || slurmctld
-        is_expected.to contain_file('/etc/slurm/scrun.lua').with(
-          ensure: 'file',
-          owner: 'root',
-          group: 'root',
-          mode: '0644',
-          source: 'puppet:///scrun.lua',
-          content: nil,
-        )
-      else
-        is_expected.not_to contain_file('/etc/slurm/scrun.lua')
-      end
+      is_expected.to contain_file('/etc/slurm/scrun.lua').with(
+        ensure: 'file',
+        owner: 'root',
+        group: 'root',
+        mode: '0644',
+        source: 'puppet:///scrun.lua',
+        content: nil,
+      )
     end
 
     context 'when configless' do

diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb
@@ -11,7 +11,7 @@
   c.slurm_repo_baseurl = ENV['SLURM_BEAKER_repo_baseurl'] || nil
 
   c.add_setting :slurm_version
-  c.slurm_version = ENV['SLURM_BEAKER_version'] || '23.11.3'
+  c.slurm_version = ENV['SLURM_BEAKER_version'] || '23.11.5'
 
   if ENV['BEAKER_set'] =~ %r{cluster}
     slurmctld_host = 'slurmctld'