summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-08-14 18:26:17 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-08-14 18:26:17 -0700
commit1e0983362464e8f2832239b09cdbc9175a51e6ec (patch)
tree509ab68f7c1d4f258cd9d853ada0e6414a83c64d /lib
parent42ddd7fe54f37b84e34b4a005de2249e53f07469 (diff)
downloadpuppet-stdlib-1e0983362464e8f2832239b09cdbc9175a51e6ec.tar.gz
puppet-stdlib-1e0983362464e8f2832239b09cdbc9175a51e6ec.tar.bz2
Revert "Merge pull request #86 from bodepd/ensure_resource"
This reverts commit 42ddd7fe54f37b84e34b4a005de2249e53f07469, reversing changes made to 53243605b28fc31618d079155c86b37b4e88a6ca.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/parser/functions/defined_with_params.rb35
-rw-r--r--lib/puppet/parser/functions/ensure_resource.rb33
2 files changed, 0 insertions, 68 deletions
diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb
deleted file mode 100644
index d7df306..0000000
--- a/lib/puppet/parser/functions/defined_with_params.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:defined_with_params,
- :type => :rvalue,
- :doc => <<-'ENDOFDOC'
-Takes a resource reference and an optional hash of attributes.
-
-Returns true if a resource with the specified attributes has already been added
-to the catalog, and false otherwise.
-
- user { 'dan':
- ensure => present,
- }
-
- if ! defined_with_params(User[dan], {'ensure' => 'present' }) {
- user { 'dan': ensure => present, }
- }
-ENDOFDOC
-) do |vals|
- reference, params = vals
- raise(ArgumentError, 'Must specify a reference') unless reference
- if (! params) || params == ''
- params = {}
- end
- ret = false
- if resource = findresource(reference.to_s)
- matches = params.collect do |key, value|
- resource[key] == value
- end
- ret = params.empty? || !matches.include?(false)
- end
- Puppet.debug("Resource #{reference} was not determined to be defined")
- ret
-end
diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb
deleted file mode 100644
index 6a9e2ed..0000000
--- a/lib/puppet/parser/functions/ensure_resource.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# Test whether a given class or definition is defined
-require 'puppet/parser/functions'
-
-Puppet::Parser::Functions.newfunction(:ensure_resource,
- :type => :statement,
- :doc => <<-'ENDOFDOC'
-Takes a resource type, title, and a list of attributes that describe a
-resource.
-
- user { 'dan':
- ensure => present,
- }
-
-This example only creates the resource if it does not already exist:
-
- ensure_resource('user, 'dan', {'ensure' => 'present' })
-
-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.
-
-ENDOFDOC
-) do |vals|
- type, title, params = vals
- raise(ArgumentError, 'Must specify a type') unless type
- raise(ArgumentError, 'Must specify a title') unless title
- params ||= {}
- if function_defined_with_params(["#{type}[#{title}]", params])
- Puppet.debug("Resource #{type}[#{title}] not created b/c it already exists")
- else
- function_create_resources([type.capitalize, { title => params }])
- end
-end