diff options
author | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-04-24 13:38:07 -0400 |
---|---|---|
committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-04-24 13:38:07 -0400 |
commit | f42fc4bfd8a689ad28a20f976cb3fdc4a889477c (patch) | |
tree | cfa5a40fe4e1ca7d01b5cea2c42de9fb04f96cba /lib/puppet/parser/functions | |
parent | 1bdb213778ac850631f323a46bf6e99d047034f5 (diff) | |
parent | d9b5e912bbb6dffff01e03a0b040fd78888f2578 (diff) | |
download | puppet-stdlib-f42fc4bfd8a689ad28a20f976cb3fdc4a889477c.tar.gz puppet-stdlib-f42fc4bfd8a689ad28a20f976cb3fdc4a889477c.tar.bz2 |
Merge pull request #238 from Spredzy/add_default_ensure_packages
(MODULES-603) Add defaults arguments to ensure_packages()
Diffstat (limited to 'lib/puppet/parser/functions')
-rw-r--r-- | lib/puppet/parser/functions/ensure_packages.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/ensure_packages.rb b/lib/puppet/parser/functions/ensure_packages.rb index 1e0f225..f1da4aa 100644 --- a/lib/puppet/parser/functions/ensure_packages.rb +++ b/lib/puppet/parser/functions/ensure_packages.rb @@ -5,19 +5,29 @@ module Puppet::Parser::Functions newfunction(:ensure_packages, :type => :statement, :doc => <<-EOS Takes a list of packages and only installs them if they don't already exist. +It optionally takes a hash as a second parameter that will be passed as the +third argument to the ensure_resource() function. EOS ) do |arguments| - if arguments.size != 1 + if arguments.size > 2 or arguments.size == 0 raise(Puppet::ParseError, "ensure_packages(): Wrong number of arguments " + - "given (#{arguments.size} for 1)") + "given (#{arguments.size} for 1 or 2)") + elsif arguments.size == 2 and !arguments[1].is_a?(Hash) + raise(Puppet::ParseError, 'ensure_packages(): Requires second argument to be a Hash') end packages = Array(arguments[0]) + if arguments[1] + defaults = { 'ensure' => 'present' }.merge(arguments[1]) + else + defaults = { 'ensure' => 'present' } + end + Puppet::Parser::Functions.function(:ensure_resource) packages.each { |package_name| - function_ensure_resource(['package', package_name, {'ensure' => 'present' } ]) + function_ensure_resource(['package', package_name, defaults ]) } end end |