Skip to content

Commit f066b5c

Browse files
committed
Prefer 'installed' to 'present' for packages
Align with Puppet default value for the `ensure` parameter of package resources.
1 parent 889b5f3 commit f066b5c

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

manifests/client.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Stdlib::Absolutepath $file,
55

66
# Options
7-
String[1] $package_version = present,
7+
String[1] $package_version = installed,
88
Optional[String[1]] $base = undef,
99
Optional[String[1]] $bind_policy = undef,
1010
Optional[String[1]] $bind_timelimit = undef,

manifests/server.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Array[String[1]] $ldapi_ifs,
1414
Stdlib::Absolutepath $default_directory,
1515
Boolean $manage_epel = true,
16-
String[1] $package_version = present,
16+
String[1] $package_version = installed,
1717
Optional[Boolean] $enable_chown = undef,
1818
Optional[Boolean] $service_hasstatus = undef,
1919
Boolean $enable = true,

manifests/utils.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See README.md for details.
22
class openldap::utils (
33
Optional[String[1]] $package = undef,
4-
String[1] $package_version = present,
4+
String[1] $package_version = installed,
55
) {
66
if $package {
77
package { $package:

spec/classes/openldap_client_install_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
case facts[:os]['release']['major']
2323
when '22.04'
2424
it {
25-
is_expected.to contain_package('libldap-2.5-0').with(ensure: :present)
25+
is_expected.to contain_package('libldap-2.5-0').with(ensure: :installed)
2626
}
2727
else
2828
it {
29-
is_expected.to contain_package('libldap-2.4-2').with(ensure: :present)
29+
is_expected.to contain_package('libldap-2.4-2').with(ensure: :installed)
3030
}
3131
end
3232
when 'RedHat'
3333
it {
34-
is_expected.to contain_package('openldap').with(ensure: :present)
34+
is_expected.to contain_package('openldap').with(ensure: :installed)
3535
}
3636
end
3737
end
@@ -45,7 +45,7 @@
4545
it { is_expected.to contain_class('openldap::client::install') }
4646

4747
it {
48-
is_expected.to contain_package('foo').with(ensure: :present)
48+
is_expected.to contain_package('foo').with(ensure: :installed)
4949
}
5050
end
5151

spec/classes/openldap_server_install_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
case facts[:osfamily]
1717
when 'Debian'
1818
it {
19-
is_expected.to contain_package('slapd').with(ensure: :present)
19+
is_expected.to contain_package('slapd').with(ensure: :installed)
2020
}
2121
when 'RedHat'
2222
it {
23-
is_expected.to contain_package('openldap-servers').with(ensure: :present)
23+
is_expected.to contain_package('openldap-servers').with(ensure: :installed)
2424
}
2525
end
2626

@@ -48,7 +48,7 @@
4848
it { is_expected.to contain_class('openldap::server::install') }
4949

5050
it {
51-
is_expected.to contain_package('foo').with(ensure: :present)
51+
is_expected.to contain_package('foo').with(ensure: :installed)
5252
}
5353
end
5454

spec/classes/openldap_utils_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
case facts[:osfamily]
1616
when 'Debian'
1717
it {
18-
is_expected.to contain_package('ldap-utils').with(ensure: :present)
18+
is_expected.to contain_package('ldap-utils').with(ensure: :installed)
1919
}
2020
when 'RedHat'
2121
it {
22-
is_expected.to contain_package('openldap-clients').with(ensure: :present)
22+
is_expected.to contain_package('openldap-clients').with(ensure: :installed)
2323
}
2424
end
2525
end
@@ -32,7 +32,7 @@
3232
it { is_expected.to compile.with_all_deps }
3333

3434
it {
35-
is_expected.to contain_package('foo').with(ensure: :present)
35+
is_expected.to contain_package('foo').with(ensure: :installed)
3636
}
3737
end
3838

0 commit comments

Comments
 (0)