Termini lists are now being generated in the help templates. This commit removes the hardcoded lists from each of the affected faces.
Signed-off-by: nfagerlund <[email protected]> --- Local-branch: ticket/2.7.x/7561-help_for_all_faces lib/puppet/face/catalog.rb | 11 ----------- lib/puppet/face/certificate.rb | 9 --------- lib/puppet/face/certificate_request.rb | 9 --------- lib/puppet/face/certificate_revocation_list.rb | 9 --------- lib/puppet/face/facts.rb | 14 -------------- lib/puppet/face/file.rb | 7 ------- lib/puppet/face/key.rb | 8 -------- lib/puppet/face/node.rb | 13 ------------- lib/puppet/face/report.rb | 9 --------- lib/puppet/face/resource.rb | 8 -------- lib/puppet/face/resource_type.rb | 8 -------- lib/puppet/face/status.rb | 8 -------- 12 files changed, 0 insertions(+), 113 deletions(-) diff --git a/lib/puppet/face/catalog.rb b/lib/puppet/face/catalog.rb index c7501ff..1335154 100644 --- a/lib/puppet/face/catalog.rb +++ b/lib/puppet/face/catalog.rb @@ -13,17 +13,6 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do in 'dot' format (for easy graph viewing with OmniGraffle or Graphviz) with '--render-as dot'. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `active_record` - * `compiler` - * `queue` - * `rest` - * `yaml` - EOT get_action(:destroy).summary "Invalid for this face." get_action(:search).summary "Query format unknown; potentially invalid for this face." diff --git a/lib/puppet/face/certificate.rb b/lib/puppet/face/certificate.rb index d77525b..cab8817 100644 --- a/lib/puppet/face/certificate.rb +++ b/lib/puppet/face/certificate.rb @@ -13,15 +13,6 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do and its "generate" action submits a CSR rather than creating a signed certificate. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `ca` - * `file` - * `rest` - EOT option "--ca-location LOCATION" do summary "The certificate authority to query" diff --git a/lib/puppet/face/certificate_request.rb b/lib/puppet/face/certificate_request.rb index de52b7f..29cf7dc 100644 --- a/lib/puppet/face/certificate_request.rb +++ b/lib/puppet/face/certificate_request.rb @@ -11,15 +11,6 @@ Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do `find` with a node certificate name to retrieve a specific request, and invoke `save` to submit a CSR. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `ca` - * `file` - * `rest` - EOT # Per-action doc overrides get_action(:destroy).summary "Invalid for this face." diff --git a/lib/puppet/face/certificate_revocation_list.rb b/lib/puppet/face/certificate_revocation_list.rb index db00ea3..0525a60 100644 --- a/lib/puppet/face/certificate_revocation_list.rb +++ b/lib/puppet/face/certificate_revocation_list.rb @@ -10,15 +10,6 @@ Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do list from the CA. Although it exposes search/save/destroy methods, they shouldn't be used under normal circumstances. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `ca` - * `file` - * `rest` - EOT get_action(:find).summary "Retrieve the certificate revocation list." get_action(:find).arguments "<dummy_key>" diff --git a/lib/puppet/face/facts.rb b/lib/puppet/face/facts.rb index d7ddf1d..05028a4 100644 --- a/lib/puppet/face/facts.rb +++ b/lib/puppet/face/facts.rb @@ -16,20 +16,6 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do front-end to the inventory service REST API. See the inventory service documentation for more detail. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `active_record` - * `couch` - * `facter` - * `inventory_active_record` - * `memory` - * `network_device` - * `rest` - * `yaml` - EOT find = get_action(:find) find.summary "Retrieve a host's facts." diff --git a/lib/puppet/face/file.rb b/lib/puppet/face/file.rb index 70b44c3..1cf9bc7 100644 --- a/lib/puppet/face/file.rb +++ b/lib/puppet/face/file.rb @@ -11,13 +11,6 @@ Puppet::Indirector::Face.define(:file, '0.0.1') do examples for the relevant syntax. EOT notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `file` - * `rest` - To retrieve the unmunged contents of a file, you must call find with --render-as s. Rendering as yaml will return a hash of metadata about the file, including its contents. diff --git a/lib/puppet/face/key.rb b/lib/puppet/face/key.rb index f19ae19..54c4975 100644 --- a/lib/puppet/face/key.rb +++ b/lib/puppet/face/key.rb @@ -11,13 +11,5 @@ Puppet::Indirector::Face.define(:key, '0.0.1') do certificate generate', and it should not be necessary to use this action directly. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `ca` - * `file` - EOT end diff --git a/lib/puppet/face/node.rb b/lib/puppet/face/node.rb index c68d718..d244127 100644 --- a/lib/puppet/face/node.rb +++ b/lib/puppet/face/node.rb @@ -10,19 +10,6 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do environment, node parameters (exposed in the parser as top-scope variables), and classes. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `active_record` - * `exec` - * `ldap` - * `memory` - * `plain` - * `rest` - * `yaml` - EOT get_action(:destroy).summary "Invalid for this face." get_action(:search).summary "Invalid for this face." diff --git a/lib/puppet/face/report.rb b/lib/puppet/face/report.rb index a5718bc..1345d63 100644 --- a/lib/puppet/face/report.rb +++ b/lib/puppet/face/report.rb @@ -5,15 +5,6 @@ Puppet::Indirector::Face.define(:report, '0.0.1') do license "Apache 2 license; see COPYING" summary "Create, display, and submit reports" - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `processor` - * `rest` - * `yaml` - EOT get_action(:find).summary "Invalid for this face." get_action(:search).summary "Invalid for this face." diff --git a/lib/puppet/face/resource.rb b/lib/puppet/face/resource.rb index 593776e..59f6286 100644 --- a/lib/puppet/face/resource.rb +++ b/lib/puppet/face/resource.rb @@ -10,14 +10,6 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do resource (originally ralsh) command line application. It is not intended to be used from the command line. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `ral` - * `rest` - EOT get_action(:destroy).summary "Invalid for this face." diff --git a/lib/puppet/face/resource_type.rb b/lib/puppet/face/resource_type.rb index 3973eb3..9d7639f 100644 --- a/lib/puppet/face/resource_type.rb +++ b/lib/puppet/face/resource_type.rb @@ -12,14 +12,6 @@ Puppet::Indirector::Face.define(:resource_type, '0.0.1') do It will eventually be extended to examine native resource types. EOT - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `parser` - * `rest` - EOT # Action documentation overrides: get_action(:save).summary = "Invalid for this face." diff --git a/lib/puppet/face/status.rb b/lib/puppet/face/status.rb index 0837955..4ae24e8 100644 --- a/lib/puppet/face/status.rb +++ b/lib/puppet/face/status.rb @@ -5,14 +5,6 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do license "Apache 2 license; see COPYING" summary "View puppet server status." - notes <<-'EOT' - This is an indirector face, which exposes `find`, `search`, `save`, and - `destroy` actions for an indirected subsystem of Puppet. Valid termini - for this face include: - - * `local` - * `rest` - EOT get_action(:destroy).summary "Invalid for this face." get_action(:save).summary "Invalid for this face." -- 1.7.3.3 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
