Skip to content

Commit acc64e3

Browse files
authored
Merge pull request #1523 from kenyon/package_ensure_installed
init: set package_ensure defaults to installed
2 parents 09562ec + dc60d08 commit acc64e3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

REFERENCE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ Data type: `Any`
13911391

13921392

13931393

1394-
Default value: `present`
1394+
Default value: `installed`
13951395

13961396
##### <a name="-nginx--package_name"></a>`package_name`
13971397

@@ -1455,7 +1455,7 @@ Data type: `Any`
14551455

14561456

14571457

1458-
Default value: `'present'`
1458+
Default value: `installed`
14591459

14601460
##### <a name="-nginx--repo_source"></a>`repo_source`
14611461

manifests/init.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,15 @@
193193
Optional[Enum['on', 'off']] $reset_timedout_connection = undef,
194194

195195
### START Package Configuration ###
196-
$package_ensure = present,
196+
$package_ensure = installed,
197197
$package_name = $nginx::params::package_name,
198198
$package_source = 'nginx',
199199
$package_flavor = undef,
200200
Boolean $manage_repo = $nginx::params::manage_repo,
201201
Hash[String[1], String[1]] $mime_types = $nginx::params::mime_types,
202202
Boolean $mime_types_preserve_defaults = false,
203203
Optional[String] $repo_release = undef,
204-
$passenger_package_ensure = 'present',
204+
$passenger_package_ensure = installed,
205205
String[1] $passenger_package_name = $nginx::params::passenger_package_name,
206206
Optional[Stdlib::HTTPUrl] $repo_source = undef,
207207
### END Package Configuration ###

spec/classes/nginx_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
it { is_expected.to contain_yumrepo('passenger').that_comes_before('Package[nginx]') }
127127
it { is_expected.to contain_yumrepo('nginx-release').that_comes_before('Package[nginx]') }
128-
it { is_expected.to contain_package('passenger').with('ensure' => 'present') }
128+
it { is_expected.to contain_package('passenger').with('ensure' => 'installed') }
129129
end
130130

131131
describe 'installs the requested passenger package version', unless: facts[:operatingsystemmajrelease] == '8' do

0 commit comments

Comments
 (0)