Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add parameters for inclusion of classes nsswitch and pam #169

Merged
merged 2 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ vas::realm: 'realm.example.com'
The following parameters are available in the `vas` class:

* [`manage_nis`](#-vas--manage_nis)
* [`manage_pam`](#-vas--manage_pam)
* [`manage_nsswitch`](#-vas--manage_nsswitch)
* [`package_version`](#-vas--package_version)
* [`enable_group_policies`](#-vas--enable_group_policies)
* [`users_allow_entries`](#-vas--users_allow_entries)
Expand Down Expand Up @@ -176,6 +178,22 @@ FIXME Missing description

Default value: `true`

##### <a name="-vas--manage_pam"></a>`manage_pam`

Data type: `Boolean`

Include pam class

Default value: `true`

##### <a name="-vas--manage_nsswitch"></a>`manage_nsswitch`

Data type: `Boolean`

Include nsswitch class

Default value: `true`

##### <a name="-vas--package_version"></a>`package_version`

Data type: `String[1]`
Expand Down
22 changes: 19 additions & 3 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
# @param manage_nis
# FIXME Missing description
#
# @param manage_pam
# Include pam class
#
# @param manage_nsswitch
# Include nsswitch class
#
# @param package_version
# The VAS package version. Used when upgrading.
#
Expand Down Expand Up @@ -473,6 +479,8 @@
# Whether TLS connections should be verified or not.
class vas (
Boolean $manage_nis = true,
Boolean $manage_pam = true,
Boolean $manage_nsswitch = true,
String[1] $package_version = 'installed',
Boolean $enable_group_policies = true,
Array[String[1]] $users_allow_entries = [],
Expand Down Expand Up @@ -744,8 +752,16 @@
fail("VAS domain mismatch, got <${facts['vas_domain']}> but wanted <${realm}>")
}

include nsswitch
include pam
if $manage_nsswitch {
include nsswitch
}

if $manage_pam {
include pam
$vasinst_require = Class['pam']
} else {
$vasinst_require = undef
}

if $_vas_is_v3 == true {
# vasgpd service only in VAS 3
Expand Down Expand Up @@ -970,7 +986,7 @@
path => '/sbin:/bin:/usr/bin:/opt/quest/bin',
timeout => 1800,
creates => $once_file,
before => Class['pam'],
before => $vasinst_require,
require => [Package['vasclnt'], Package['vasgp'], File['keytab'], $require_yp_package],
}

Expand Down
9 changes: 5 additions & 4 deletions spec/classes/data_types_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
message: 'expects an Array|index .* expects a String value',
},
'Boolean' => {
name: ['manage_nis', 'enable_group_policies', 'domain_change', 'vas_conf_vasd_workstation_mode',
'vas_conf_vasd_workstation_mode_group_do_member', 'vas_conf_vasd_workstation_mode_groups_skip_update',
'vas_conf_vasd_ws_resolve_uid', 'vas_conf_libdefaults_forwardable', 'vas_conf_libvas_site_only_servers',
'vas_conf_libvas_use_dns_srv', 'vas_conf_libvas_use_tcp_only', 'symlink_vastool_binary', 'unjoin_vas'],
name: ['manage_nis', 'manage_pam', 'manage_nsswitch', 'enable_group_policies', 'domain_change',
'vas_conf_vasd_workstation_mode', 'vas_conf_vasd_workstation_mode_group_do_member',
'vas_conf_vasd_workstation_mode_groups_skip_update', 'vas_conf_vasd_ws_resolve_uid',
'vas_conf_libdefaults_forwardable', 'vas_conf_libvas_site_only_servers', 'vas_conf_libvas_use_dns_srv',
'vas_conf_libvas_use_tcp_only', 'symlink_vastool_binary', 'unjoin_vas'],
valid: [true, false],
invalid: ['true', 'false', ['array'], { 'ha' => 'sh' }, 3, 2.42, nil],
message: 'expects a Boolean',
Expand Down
38 changes: 38 additions & 0 deletions spec/classes/parameter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,44 @@
end
end

[true, false].each do |value|
describe "with manage_nsswitch set to valid #{value}" do
let(:params) do
required_params.merge(
manage_nsswitch: value,
# Class PAM includes nsswitch as well, disable it for test
manage_pam: value,
)
end

case value
when true
it { is_expected.to contain_class('nsswitch') }
else
it { is_expected.not_to contain_class('nsswitch') }
end
end
end

[true, false].each do |value|
describe "with manage_pam set to valid #{value}" do
let(:params) do
required_params.merge(
manage_pam: value,
)
end

case value
when true
it { is_expected.to contain_class('pam') }
it { is_expected.to contain_exec('vasinst').with_before('Class[Pam]') }
else
it { is_expected.not_to contain_class('pam') }
it { is_expected.not_to contain_exec('vasinst').with_before('Class[Pam]') }
end
end
end

describe 'with manage_nis set to valid true and nisdomainname is defined' do
let(:params) do
required_params.merge(
Expand Down