diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-02-24 20:36:21 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-02-24 20:36:21 +1100 |
| commit | ed5562aae444b81deabf9217be98886535620c76 (patch) | |
| tree | a02a44ad104f64fd7372a4b286f573cf04b7d90e | |
| parent | 7e207a1d2d0dafff96e34a51ce7798f8e62bac19 (diff) | |
| parent | 5df9badbae0a652094216b52c815c0cc72f3ea42 (diff) | |
| download | puppet-ed5562aae444b81deabf9217be98886535620c76.tar.gz puppet-ed5562aae444b81deabf9217be98886535620c76.tar.xz puppet-ed5562aae444b81deabf9217be98886535620c76.zip | |
Merge branch 'tickets/master/2016'
| -rw-r--r-- | lib/puppet/reference/metaparameter.rb | 38 | ||||
| -rw-r--r-- | lib/puppet/reference/type.rb | 36 |
2 files changed, 38 insertions, 36 deletions
diff --git a/lib/puppet/reference/metaparameter.rb b/lib/puppet/reference/metaparameter.rb new file mode 100644 index 000000000..6eb662ba7 --- /dev/null +++ b/lib/puppet/reference/metaparameter.rb @@ -0,0 +1,38 @@ +metaparameter = Puppet::Util::Reference.newreference :metaparameter, :doc => "All Puppet metaparameters and all their details" do + + str = %{ +Metaparameters +-------------- +Metaparameters are parameters that work with any resource type; they are part of the +Puppet framework itself rather than being part of the implementation of any +given instance. Thus, any defined metaparameter can be used with any instance +in your manifest, including defined components. + +Available Metaparameters +++++++++++++++++++++++++ +} + begin + params = [] + Puppet::Type.eachmetaparam { |param| + params << param + } + + params.sort { |a,b| + a.to_s <=> b.to_s + }.each { |param| + str += paramwrap(param.to_s, scrub(Puppet::Type.metaparamdoc(param)), :level => 4) + #puts "<dt>" + param.to_s + "</dt>" + #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ') + #puts "<dd>" + #puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab) + #puts scrub(Puppet::Type.metaparamdoc(param)) + #puts "</dd>" + + #puts "" + } + rescue => detail + puts detail.backtrace + puts "incorrect metaparams: %s" % detail + exit(1) + end +end diff --git a/lib/puppet/reference/type.rb b/lib/puppet/reference/type.rb index d9ac57f2b..c80b17b0a 100644 --- a/lib/puppet/reference/type.rb +++ b/lib/puppet/reference/type.rb @@ -9,42 +9,6 @@ type = Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource } str = %{ -Metaparameters --------------- -Metaparameters are parameters that work with any resource type; they are part of the -Puppet framework itself rather than being part of the implementation of any -given instance. Thus, any defined metaparameter can be used with any instance -in your manifest, including defined components. - -Available Metaparameters -++++++++++++++++++++++++ -} - begin - params = [] - Puppet::Type.eachmetaparam { |param| - params << param - } - - params.sort { |a,b| - a.to_s <=> b.to_s - }.each { |param| - str += paramwrap(param.to_s, scrub(Puppet::Type.metaparamdoc(param)), :level => 4) - #puts "<dt>" + param.to_s + "</dt>" - #puts tab(1) + Puppet::Type.metaparamdoc(param).scrub.indent($tab)gsub(/\n\s*/,' ') - #puts "<dd>" - #puts indent(scrub(Puppet::Type.metaparamdoc(param)), $tab) - #puts scrub(Puppet::Type.metaparamdoc(param)) - #puts "</dd>" - - #puts "" - } - rescue => detail - puts detail.backtrace - puts "incorrect metaparams: %s" % detail - exit(1) - end - - str += %{ Resource Types -------------- |