From e08734af5a38cb9ad4bc2323104a1a8a76019bb8 Mon Sep 17 00:00:00 2001 From: Alex Cline Date: Fri, 3 May 2013 15:47:27 -0400 Subject: (#20548) Allow an array of resource titles to be passed into the ensure_resource function This patch allows an array of resource titles to be passed into the ensure_resource function. Each item in the array will be checked for existence and will be created if it doesn't already exist. --- lib/puppet/parser/functions/ensure_resource.rb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'lib/puppet/parser/functions/ensure_resource.rb') diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb index fba2035..8ede967 100644 --- a/lib/puppet/parser/functions/ensure_resource.rb +++ b/lib/puppet/parser/functions/ensure_resource.rb @@ -19,17 +19,27 @@ If the resource already exists but does not match the specified parameters, this function will attempt to recreate the resource leading to a duplicate resource definition error. +An array of resources can also be passed in and each will be created with +the type and parameters specified if it doesn't already exist. + + ensure_resource('user', ['dan','alex'], {'ensure' => 'present'}) + ENDOFDOC ) do |vals| type, title, params = vals raise(ArgumentError, 'Must specify a type') unless type raise(ArgumentError, 'Must specify a title') unless title params ||= {} - Puppet::Parser::Functions.function(:defined_with_params) - if function_defined_with_params(["#{type}[#{title}]", params]) - Puppet.debug("Resource #{type}[#{title}] not created b/c it already exists") - else - Puppet::Parser::Functions.function(:create_resources) - function_create_resources([type.capitalize, { title => params }]) + + items = title.kind_of?(Array) ? title : [].push(title) + + items.each do |item| + Puppet::Parser::Functions.function(:defined_with_params) + if function_defined_with_params(["#{type}[#{item}]", params]) + Puppet.debug("Resource #{type}[#{item}] not created b/c it already exists") + else + Puppet::Parser::Functions.function(:create_resources) + function_create_resources([type.capitalize, { item => params }]) + end end end -- cgit v1.2.3 From de253db5648c0aa15e7fcead9755488e9d8642fc Mon Sep 17 00:00:00 2001 From: Alex Cline Date: Mon, 6 May 2013 13:52:57 -0400 Subject: Changed str-to-array conversion and removed abbreviation. --- lib/puppet/parser/functions/ensure_resource.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/puppet/parser/functions/ensure_resource.rb') diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb index 8ede967..36c423a 100644 --- a/lib/puppet/parser/functions/ensure_resource.rb +++ b/lib/puppet/parser/functions/ensure_resource.rb @@ -31,12 +31,12 @@ ENDOFDOC raise(ArgumentError, 'Must specify a title') unless title params ||= {} - items = title.kind_of?(Array) ? title : [].push(title) + items = title.kind_of?(Array) ? title : [title] items.each do |item| Puppet::Parser::Functions.function(:defined_with_params) if function_defined_with_params(["#{type}[#{item}]", params]) - Puppet.debug("Resource #{type}[#{item}] not created b/c it already exists") + Puppet.debug("Resource #{type}[#{item}] not created because it already exists") else Puppet::Parser::Functions.function(:create_resources) function_create_resources([type.capitalize, { item => params }]) -- cgit v1.2.3 From d38bce0488dd70a6f8a8a2c9b91a98a231f28f02 Mon Sep 17 00:00:00 2001 From: Alex Cline Date: Mon, 6 May 2013 16:16:38 -0400 Subject: Terser method of string to array conversion courtesy of ethooz. --- lib/puppet/parser/functions/ensure_resource.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/puppet/parser/functions/ensure_resource.rb') diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb index 36c423a..a9a1733 100644 --- a/lib/puppet/parser/functions/ensure_resource.rb +++ b/lib/puppet/parser/functions/ensure_resource.rb @@ -31,7 +31,7 @@ ENDOFDOC raise(ArgumentError, 'Must specify a title') unless title params ||= {} - items = title.kind_of?(Array) ? title : [title] + items = [title].flatten items.each do |item| Puppet::Parser::Functions.function(:defined_with_params) -- cgit v1.2.3