Manage cli_filter.lua like other configless managed configs

treydock · Feb 19, 2024 · ae3a575 · ae3a575
1 parent abd6ebc
commit ae3a575
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 26 deletions.
diff --git a/manifests/common/config.pp b/manifests/common/config.pp
@@ -34,9 +34,7 @@
     $slurm::nodesets.each |$name, $_nodeset| {
       slurm::nodeset { $name: * => $_nodeset }
     }
-  }
 
-  if $slurm::manage_slurm_conf and ! $slurm::configless {
     concat { 'slurm-topology.conf':
       ensure => 'present',
       path   => $slurm::topology_conf_path,
@@ -139,20 +137,20 @@
       source  => $slurm::oci_conf_source,
       notify  => $slurm::service_notify,
     }
-  }
 
-  if ($slurm::client or $slurm::slurmctld) and ($slurm::cli_filter_lua_source or $slurm::cli_filter_lua_content) {
-    file { "${slurm::conf_dir}/cli_filter.lua":
-      ensure  => 'file',
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      source  => $slurm::cli_filter_lua_source,
-      content => $slurm::cli_filter_lua_content,
-    }
+    if $slurm::cli_filter_lua_source or $slurm::cli_filter_lua_content {
+      file { "${slurm::conf_dir}/cli_filter.lua":
+        ensure  => 'file',
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0644',
+        source  => $slurm::cli_filter_lua_source,
+        content => $slurm::cli_filter_lua_content,
+      }
 
-    if $slurm::slurmctld and $slurm::enable_configless {
-      File["${slurm::conf_dir}/cli_filter.lua"] ~> Exec['scontrol reconfig']
+      if $slurm::slurmctld and $slurm::enable_configless {
+        File["${slurm::conf_dir}/cli_filter.lua"] ~> Exec['scontrol reconfig']
+      }
     }
   }
 

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