diff options
author | Dan Prince <dprince@redhat.com> | 2015-07-20 16:18:52 -0400 |
---|---|---|
committer | Martin Mágr <mmagr@redhat.com> | 2015-09-03 11:35:25 +0200 |
commit | e3abcd6b5330959016b43115a8bf1b1cef668d30 (patch) | |
tree | 2fa5a31fe28813dcad3426d0dbff3c1e58221210 /lib | |
parent | c529fce3ef2f246909cb821bc2319cc5413960d3 (diff) |
Add package_manifest resource.
This patch converts the write_package_names function into
a proper resource. Using the write_package_names only works
if the function comes last in the puppet manifest. By
making the same functionality a custom resource we allow
for it to exist anywhere in the manifest and provide the
same functionality.
The new syntax would be:
package_manifest{'/tmp/foo': ensure => present}
Co-Authored-By: Martin Mágr <mmagr@redhat.com>
Change-Id: If3e03b1983fed47082fac8ce63f975557dbc503c
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/parser/functions/write_package_names.rb | 22 | ||||
-rw-r--r-- | lib/puppet/provider/package_manifest/flat_file.rb | 39 | ||||
-rw-r--r-- | lib/puppet/type/package_manifest.rb | 8 |
3 files changed, 47 insertions, 22 deletions
diff --git a/lib/puppet/parser/functions/write_package_names.rb b/lib/puppet/parser/functions/write_package_names.rb deleted file mode 100644 index 8f99674..0000000 --- a/lib/puppet/parser/functions/write_package_names.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'fileutils' - -module Puppet::Parser::Functions - newfunction(:write_package_names, :doc => "Write package names which are managed via this puppet run to a file.") do |arg| - if arg[0].class == String - begin - output_file = arg[0] - packages = catalog.resources.collect { |r| r.title if r.type == 'Package' }.compact - FileUtils.mkdir_p(File.dirname(output_file)) - File.open(output_file, 'w') do |f| - packages.each do |pkg_name| - f.write(pkg_name + "\n") - end - end - rescue JSON::ParserError - raise Puppet::ParseError, "Syntax error: #{arg[0]} is invalid" - end - else - raise Puppet::ParseError, "Syntax error: #{arg[0]} is not a String" - end - end -end diff --git a/lib/puppet/provider/package_manifest/flat_file.rb b/lib/puppet/provider/package_manifest/flat_file.rb new file mode 100644 index 0000000..96e033b --- /dev/null +++ b/lib/puppet/provider/package_manifest/flat_file.rb @@ -0,0 +1,39 @@ + +require 'set' + + +Puppet::Type.type(:package_manifest).provide(:flat_file) do + + desc "Write package manifest to a flat file" + + def exists? + # exists? is always run before create, so we can create package list here + @packages = resource.catalog.resources.collect { |r| + r.name if r.type == :package + }.compact.sort + + exists = File.exist?(resource[:path]) + if exists + new_content = Set.new @packages + old_content = Set.new( + File.open(resource[:path], 'r').each_line.collect{ |pkg| pkg.strip() } + ) + exists = new_content == old_content + end + exists + end + + def create + FileUtils.mkdir_p(File.dirname(resource[:path])) + File.open(resource[:path], 'w') do |f| + @packages.each do |pkg_name| + f.puts(pkg_name) + end + end + end + + def destroy + File.delete(resource[:path]) + end + +end diff --git a/lib/puppet/type/package_manifest.rb b/lib/puppet/type/package_manifest.rb new file mode 100644 index 0000000..9ee3270 --- /dev/null +++ b/lib/puppet/type/package_manifest.rb @@ -0,0 +1,8 @@ +Puppet::Type.newtype(:package_manifest) do + + ensurable + newparam(:path, :namevar => true) do + newvalues(/\S+\/\S+/) + end + +end |