Fix user shell for Debian

treydock · Feb 18, 2024 · 60d9207 · 60d9207
1 parent 1aaf2fc
commit 60d9207
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 7 deletions.
diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
@@ -25,3 +25,4 @@ slurm::source_dependencies:
   - libyaml-dev
 slurm::env_dir: /etc/default
 slurm::slurmrestd_user_group: nogroup
+slurm::slurm_user_shell: /usr/sbin/nologin
diff --git a/data/os/Ubuntu.yaml b/data/os/Ubuntu.yaml
@@ -0,0 +1 @@
+slurm::slurm_user_shell: /sbin/nologin
diff --git a/hiera.yaml b/hiera.yaml
@@ -8,6 +8,8 @@ defaults:  # Used for any hierarchy level that omits these keys.
 hierarchy:
   - name: 'os name major release'
     path: "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+  - name: 'os name'
+    path: "os/%{facts.os.name}.yaml"
   - name: 'os family major release'
     path: "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
   - name: 'os family'

diff --git a/spec/shared_examples/slurm_client.rb b/spec/shared_examples/slurm_client.rb
@@ -7,7 +7,7 @@
   it { is_expected.to contain_class('slurm::common::setup').that_comes_before('Class[slurm::common::config]') }
   it { is_expected.to contain_class('slurm::common::config') }
 
-  it_behaves_like 'slurm::common::user'
+  it_behaves_like 'slurm::common::user', facts
   if facts[:os]['family'] == 'Debian'
     it_behaves_like 'slurm::common::install::apt', facts
   else

diff --git a/spec/shared_examples/slurm_common_user.rb b/spec/shared_examples/slurm_common_user.rb
@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
-shared_examples_for 'slurm::common::user' do
+shared_examples_for 'slurm::common::user' do |facts|
+  let(:slurm_user_shell) do
+    if facts[:os]['name'] == 'Debian'
+      '/usr/sbin/nologin'
+    else
+      '/sbin/nologin'
+    end
+  end
+
   it do
     is_expected.to contain_group('slurm').with(ensure: 'present',
                                                name: 'slurm',
@@ -14,7 +22,7 @@
                                               name: 'slurm',
                                               uid: nil,
                                               gid: 'slurm',
-                                              shell: '/sbin/nologin',
+                                              shell: slurm_user_shell,
                                               home: '/var/lib/slurm',
                                               managehome: 'true',
                                               comment: 'SLURM User',

diff --git a/spec/shared_examples/slurm_slurmctld.rb b/spec/shared_examples/slurm_slurmctld.rb
@@ -10,7 +10,7 @@
   it { is_expected.to contain_class('slurm::slurmctld::config').that_comes_before('Class[slurm::slurmctld::service]') }
   it { is_expected.to contain_class('slurm::slurmctld::service') }
 
-  it_behaves_like 'slurm::common::user'
+  it_behaves_like 'slurm::common::user', facts
   if facts[:os]['family'] == 'Debian'
     it_behaves_like 'slurm::common::install::apt', facts
     it_behaves_like 'slurm::common::install::apt-slurmctld'

diff --git a/spec/shared_examples/slurm_slurmd.rb b/spec/shared_examples/slurm_slurmd.rb
@@ -10,7 +10,7 @@
   it { is_expected.to contain_class('slurm::slurmd::config').that_comes_before('Class[slurm::slurmd::service]') }
   it { is_expected.to contain_class('slurm::slurmd::service') }
 
-  it_behaves_like 'slurm::common::user'
+  it_behaves_like 'slurm::common::user', facts
   if facts[:os]['family'] == 'Debian'
     it_behaves_like 'slurm::common::install::apt', facts
     it_behaves_like 'slurm::common::install::apt-slurmd'

diff --git a/spec/shared_examples/slurm_slurmdbd.rb b/spec/shared_examples/slurm_slurmdbd.rb
@@ -10,7 +10,7 @@
   it { is_expected.to contain_class('slurm::slurmdbd::config').that_comes_before('Class[slurm::slurmdbd::service]') }
   it { is_expected.to contain_class('slurm::slurmdbd::service') }
 
-  it_behaves_like 'slurm::common::user'
+  it_behaves_like 'slurm::common::user', facts
   if facts[:os]['family'] == 'Debian'
     it_behaves_like 'slurm::common::install::apt-slurmdbd'
   else

diff --git a/spec/shared_examples/slurm_slurmrestd.rb b/spec/shared_examples/slurm_slurmrestd.rb
@@ -6,7 +6,7 @@
   it { is_expected.to contain_class('slurm::common::config').that_comes_before('Class[slurm::slurmrestd::service]') }
   it { is_expected.to contain_class('slurm::slurmrestd::service') }
 
-  it_behaves_like 'slurm::common::user'
+  it_behaves_like 'slurm::common::user', facts
   if facts[:os]['family'] == 'RedHat'
     it_behaves_like 'slurm::common::install::rpm-slurmrestd'
   end