Skip to content

(Modules 4377) Causes ensure_packages to accept concurrent declarations with ensure => 'present' and 'installed' #716

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 7, 2017
Merged

(Modules 4377) Causes ensure_packages to accept concurrent declarations with ensure => 'present' and 'installed' #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d0ec4
Include routine to converge ensure values 'present' and 'installed'
Feb 3, 2017
530d2ef
Add spec test for present + installed convergence
Feb 3, 2017
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
6 changes: 6 additions & 0 deletions lib/puppet/parser/functions/ensure_packages.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ module Puppet::Parser::Functions
if arguments[0].is_a?(Hash)
if arguments[1]
defaults = { 'ensure' => 'present' }.merge(arguments[1])
if defaults['ensure'] == 'installed'
defaults['ensure'] = 'present'
end
else
defaults = { 'ensure' => 'present' }
end
Expand All @@ -31,6 +34,9 @@ module Puppet::Parser::Functions

if arguments[1]
defaults = { 'ensure' => 'present' }.merge(arguments[1])
if defaults['ensure'] == 'installed'
defaults['ensure'] = 'present'
end
else
defaults = { 'ensure' => 'present' }
end
Expand Down
12 changes: 12 additions & 0 deletions spec/functions/ensure_packages_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,16 @@
it { expect(lambda { catalogue }).to contain_package('foo').with({'provider' => 'rpm', 'ensure' => 'present'}) }
it { expect(lambda { catalogue }).to contain_package('bar').with({'provider' => 'gem', 'ensure' => 'present'}) }
end

context 'given a catalog with "package { puppet: ensure => present }"' do
let(:pre_condition) { 'package { puppet: ensure => present }' }

describe 'after running ensure_package("puppet", { "ensure" => "installed" })' do
before { subject.call(['puppet', { "ensure" => "installed" }]) }

# this lambda is required due to strangeness within rspec-puppet's expectation handling
it { expect(lambda { catalogue }).to contain_package('puppet').with_ensure('present') }
end
end

end