puppet 2.6.18 → 2.7.1

data/lib/puppet/application/node.rb

@@ -0,0 +1,4 @@
+require 'puppet/application/indirection_base'
+
+class Puppet::Application::Node < Puppet::Application::IndirectionBase
+end

data/lib/puppet/application/parser.rb

@@ -0,0 +1,5 @@
+require 'puppet/application/face_base'
+require 'puppet/face'
+
+class Puppet::Application::Parser < Puppet::Application::FaceBase
+end

data/lib/puppet/application/plugin.rb

@@ -0,0 +1,3 @@
+require 'puppet/application/face_base'
+class Puppet::Application::Plugin < Puppet::Application::FaceBase
+end

data/lib/puppet/application/queue.rb

@@ -10,6 +10,7 @@ class Puppet::Application::Queue < Puppet::Application
     require 'puppet/daemon'
     @daemon = Puppet::Daemon.new
     @daemon.argv = ARGV.dup
+    Puppet::Util::Log.newdestination(:console)
 
     # Do an initial trap, so that cancels don't get a stack trace.
 
@@ -36,26 +37,88 @@ class Puppet::Application::Queue < Puppet::Application
   option("--debug","-d")
   option("--verbose","-v")
 
-  option("--logdest DEST", "-l DEST") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:setdest] = true
-    rescue => detail
-      puts detail.backtrace if Puppet[:debug]
-      $stderr.puts detail.to_s
-    end
+  def help
+    <<-HELP
+
+puppet-queue(8) -- Queuing daemon for asynchronous storeconfigs
+========
+
+SYNOPSIS
+--------
+Retrieves serialized storeconfigs records from a queue and processes
+them in order.
+
+
+USAGE
+-----
+puppet queue [-d|--debug] [-v|--verbose]
+
+
+DESCRIPTION
+-----------
+This application runs as a daemon and processes storeconfigs data,
+retrieving the data from a stomp server message queue and writing it to
+a database.
+
+For more information, including instructions for properly setting up
+your puppet master and message queue, see the documentation on setting
+up asynchronous storeconfigs at:
+http://projects.puppetlabs.com/projects/1/wiki/Using_Stored_Configuration
+
+
+OPTIONS
+-------
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'server' is a valid
+configuration parameter, so you can specify '--server <servername>' as
+an argument.
+
+See the configuration file documentation at
+http://docs.puppetlabs.com/references/stable/configuration.html for the
+full list of acceptable parameters. A commented list of all
+configuration options can also be generated by running puppet queue with
+'--genconfig'.
+
+* --debug:
+  Enable full debugging.
+
+* --help:
+  Print this help message
+
+* --verbose:
+  Turn on verbose reporting.
+
+* --version:
+  Print the puppet version number and exit.
+
+
+EXAMPLE
+-------
+    $ puppet queue
+
+
+AUTHOR
+------
+Luke Kanies
+
+
+COPYRIGHT
+---------
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+
+    HELP
   end
 
   def main
     require 'puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
     Puppet.notice "Starting puppetqd #{Puppet.version}"
     Puppet::Resource::Catalog::Queue.subscribe do |catalog|
-      # Once you have a Puppet::Resource::Catalog instance, calling save on it should suffice
+      # Once you have a Puppet::Resource::Catalog instance, passing it to save should suffice
       # to put it through to the database via its active_record indirector (which is determined
       # by the terminus_class = :active_record setting above)
       Puppet::Util.benchmark(:notice, "Processing queued catalog for #{catalog.name}") do
         begin
-          catalog.save
+          Puppet::Resource::Catalog.indirection.save(catalog)
         rescue => detail
           puts detail.backtrace if Puppet[:trace]
           Puppet.err "Could not save queued catalog for #{catalog.name}: #{detail}"
@@ -76,7 +139,6 @@ class Puppet::Application::Queue < Puppet::Application
         Puppet::Util::Log.level = :info
       end
     end
-    Puppet::Util::Log.newdestination(:syslog) unless options[:setdest]
   end
 
   def setup
@@ -89,7 +151,7 @@ class Puppet::Application::Queue < Puppet::Application
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     require 'puppet/resource/catalog'
-    Puppet::Resource::Catalog.terminus_class = :active_record
+    Puppet::Resource::Catalog.indirection.terminus_class = :active_record
 
     daemon.daemonize if Puppet[:daemonize]
 
@@ -97,6 +159,6 @@ class Puppet::Application::Queue < Puppet::Application
     # class set up, because if storeconfigs is enabled,
     # we'll get a loop of continually caching the catalog
     # for storage again.
-    Puppet::Resource::Catalog.cache_class = nil
+    Puppet::Resource::Catalog.indirection.cache_class = nil
   end
 end

data/lib/puppet/application/report.rb

@@ -0,0 +1,4 @@
+require 'puppet/application/indirection_base'
+
+class Puppet::Application::Report < Puppet::Application::IndirectionBase
+end

data/lib/puppet/application/resource.rb

@@ -35,6 +35,108 @@ class Puppet::Application::Resource < Puppet::Application
     @extra_params << arg.to_sym
   end
 
+  def help
+    <<-HELP
+
+puppet-resource(8) -- The resource abstraction layer shell
+========
+
+SYNOPSIS
+--------
+Uses the Puppet RAL to directly interact with the system.
+
+
+USAGE
+-----
+puppet resource [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit]
+  [-H|--host <host>] [-p|--param <parameter>] [-t|--types] <type>
+  [<name>] [<attribute>=<value> ...]
+
+
+DESCRIPTION
+-----------
+This command provides simple facilities for converting current system
+state into Puppet code, along with some ability to modify the current
+state using Puppet's RAL.
+
+By default, you must at least provide a type to list, in which case
+puppet resource will tell you everything it knows about all resources of
+that type. You can optionally specify an instance name, and puppet
+resource will only describe that single instance.
+
+If given a type, a name, and a series of <attribute>=<value> pairs,
+puppet resource will modify the state of the specified resource.
+Alternately, if given a type, a name, and the '--edit' flag, puppet
+resource will write its output to a file, open that file in an editor,
+and then apply the saved file as a Puppet transaction.
+
+
+OPTIONS
+-------
+Note that any configuration parameter that's valid in the configuration
+file is also a valid long argument. For example, 'ssldir' is a valid
+configuration parameter, so you can specify '--ssldir <directory>' as an
+argument.
+
+See the configuration file documentation at
+http://docs.puppetlabs.com/references/stable/configuration.html for the
+full list of acceptable parameters. A commented list of all
+configuration options can also be generated by running puppet with
+'--genconfig'.
+
+* --debug:
+  Enable full debugging.
+
+* --edit:
+  Write the results of the query to a file, open the file in an editor,
+  and read the file back in as an executable Puppet manifest.
+
+* --host:
+  When specified, connect to the resource server on the named host
+  and retrieve the list of resouces of the type specified.
+
+* --help:
+  Print this help message.
+
+* --param:
+  Add more parameters to be outputted from queries.
+
+* --types:
+  List all available types.
+
+* --verbose:
+  Print extra information.
+
+
+EXAMPLE
+-------
+This example uses `puppet resource` to return a Puppet configuration for
+the user `luke`:
+
+    $ puppet resource user luke
+    user { 'luke':
+     home => '/home/luke',
+     uid => '100',
+     ensure => 'present',
+     comment => 'Luke Kanies,,,',
+     gid => '1000',
+     shell => '/bin/bash',
+     groups => ['sysadmin','audio','video','puppet']
+    }
+
+
+AUTHOR
+------
+Luke Kanies
+
+
+COPYRIGHT
+---------
+Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+
+    HELP
+  end
+
   def main
     args = command_line.args
     type = args.shift or raise "You must specify the type to display"
@@ -76,37 +178,27 @@ class Puppet::Application::Resource < Puppet::Application
 
     text = if name
       if params.empty?
-        [ Puppet::Resource.find( key ) ]
+        [ Puppet::Resource.indirection.find( key ) ]
       else
-        [ Puppet::Resource.new( type, name, :parameters => params ).save( key ) ]
+        [ Puppet::Resource.indirection.save(Puppet::Resource.new( type, name, :parameters => params ), key) ]
       end
     else
-      if type == "file"
-        raise "Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc"
-      end
-      Puppet::Resource.search( key, {} )
+      Puppet::Resource.indirection.search( key, {} )
     end.map(&format).join("\n")
 
     if options[:edit]
-      require 'tempfile'
-      # Prefer the current directory, which is more likely to be secure
-      # and, in the case of interactive use, accessible to the user.
-      tmpfile = Tempfile.new('x2puppet', Dir.pwd)
+      file = "/tmp/x2puppet-#{Process.pid}.pp"
       begin
-        # sync write, so nothing buffers before we invoke the editor.
-        tmpfile.sync = true
-        tmpfile.puts text
-
-        # edit the content
-        system(ENV["EDITOR"] || 'vi', tmpfile.path)
-
-        # ...and, now, pass that file to puppet to apply.  Because
-        # many editors rename or replace the original file we need to
-        # feed the pathname, not the file content itself, to puppet.
-        system('puppet -v ' + tmpfile.path)
+        File.open(file, "w") do |f|
+          f.puts text
+        end
+        ENV["EDITOR"] ||= "vi"
+        system(ENV["EDITOR"], file)
+        system("puppet -v #{file}")
       ensure
-        # The temporary file will be safely removed.
-        tmpfile.close(true)
+        #if FileTest.exists? file
+        #    File.unlink(file)
+        #end
       end
     else
       puts text

data/lib/puppet/application/resource_type.rb

@@ -0,0 +1,4 @@
+require 'puppet/application/indirection_base'
+
+class Puppet::Application::Resource_type < Puppet::Application::IndirectionBase
+end

data/lib/puppet/application/secret_agent.rb

@@ -0,0 +1,6 @@
+require 'puppet/application/face_base'
+require 'puppet/face'
+
+class Puppet::Application::Secret_agent < Puppet::Application::FaceBase
+  run_mode :agent
+end

data/lib/puppet/application/status.rb

@@ -0,0 +1,4 @@
+require 'puppet/application/indirection_base'
+
+class Puppet::Application::Status < Puppet::Application::IndirectionBase
+end

data/lib/puppet/configurer.rb

@@ -5,6 +5,8 @@ require 'puppet/network/http_pool'
 require 'puppet/util'
 
 class Puppet::Configurer
+  class CommandHookError < RuntimeError; end
+
   require 'puppet/configurer/fact_handler'
   require 'puppet/configurer/plugin_handler'
 
@@ -77,11 +79,21 @@ class Puppet::Configurer
     download_plugins unless options[:skip_plugin_download]
 
     download_fact_plugins unless options[:skip_plugin_download]
+
+    execute_prerun_command
   end
 
   # Get the remote catalog, yo.  Returns nil if no catalog can be found.
-  def retrieve_catalog(fact_options)
-    fact_options ||= {}
+  def retrieve_catalog
+    if Puppet::Resource::Catalog.indirection.terminus_class == :rest
+      # This is a bit complicated.  We need the serialized and escaped facts,
+      # and we need to know which format they're encoded in.  Thus, we
+      # get a hash with both of these pieces of information.
+      fact_options = facts_for_uploading
+    else
+      fact_options = {}
+    end
+
     # First try it with no cache, then with the cache.
     unless (Puppet[:use_cached_catalog] and result = retrieve_catalog_from_cache(fact_options)) or result = retrieve_new_catalog(fact_options)
       if ! Puppet[:usecacheonfailure]
@@ -105,76 +117,63 @@ class Puppet::Configurer
     catalog
   end
 
-  # Retrieve (optionally) and apply a catalog. If a catalog is passed in
-  # the options, then apply that one, otherwise retrieve it.
-  def retrieve_and_apply_catalog(options, fact_options)
-    unless catalog = (options.delete(:catalog) || retrieve_catalog(fact_options))
-      Puppet.err "Could not retrieve catalog; skipping run"
-      return
-    end
-
-    report = options[:report]
-    report.configuration_version = catalog.version
-
-    benchmark(:notice, "Finished catalog run") do
-      catalog.apply(options)
-    end
-
-    report.finalize_report
-    report
-  end
-
   # The code that actually runs the catalog.
   # This just passes any options on to the catalog,
   # which accepts :tags and :ignoreschedules.
   def run(options = {})
+    begin
+      prepare(options)
+    rescue SystemExit,NoMemoryError
+      raise
+    rescue Exception => detail
+      puts detail.backtrace if Puppet[:trace]
+      Puppet.err "Failed to prepare catalog: #{detail}"
+    end
+
     options[:report] ||= Puppet::Transaction::Report.new("apply")
     report = options[:report]
-
     Puppet::Util::Log.newdestination(report)
-    begin
-      prepare(options)
 
-      if Puppet::Resource::Catalog.indirection.terminus_class == :rest
-        # This is a bit complicated.  We need the serialized and escaped facts,
-        # and we need to know which format they're encoded in.  Thus, we
-        # get a hash with both of these pieces of information.
-        fact_options = facts_for_uploading
-      end
+    if catalog = options[:catalog]
+      options.delete(:catalog)
+    elsif ! catalog = retrieve_catalog
+      Puppet.err "Could not retrieve catalog; skipping run"
+      return
+    end
 
-      # set report host name now that we have the fact
-      report.host = Puppet[:node_name_value]
+    report.configuration_version = catalog.version
 
-      begin
-        execute_prerun_command or return nil
-        retrieve_and_apply_catalog(options, fact_options)
-      rescue SystemExit,NoMemoryError
-        raise
-      rescue => detail
-        puts detail.backtrace if Puppet[:trace]
-        Puppet.err "Failed to apply catalog: #{detail}"
-        return nil
-      ensure
-        execute_postrun_command or return nil
+    transaction = nil
+
+    begin
+      benchmark(:notice, "Finished catalog run") do
+        transaction = catalog.apply(options)
       end
-    ensure
-      # Make sure we forget the retained module_directories of any autoload
-      # we might have used.
-      Thread.current[:env_module_directories] = nil
-
-      # Now close all of our existing http connections, since there's no
-      # reason to leave them lying open.
-      Puppet::Network::HttpPool.clear_http_instances
+      report
+    rescue => detail
+      puts detail.backtrace if Puppet[:trace]
+      Puppet.err "Failed to apply catalog: #{detail}"
+      return
     end
   ensure
+    # Make sure we forget the retained module_directories of any autoload
+    # we might have used.
+    Thread.current[:env_module_directories] = nil
+
+    # Now close all of our existing http connections, since there's no
+    # reason to leave them lying open.
+    Puppet::Network::HttpPool.clear_http_instances
+    execute_postrun_command
+
     Puppet::Util::Log.close(report)
-    send_report(report)
+    send_report(report, transaction)
   end
 
-  def send_report(report)
+  def send_report(report, trans)
+    report.finalize_report if trans
     puts report.summary if Puppet[:summarize]
     save_last_run_summary(report)
-    report.save if Puppet[:report]
+    Puppet::Transaction::Report.indirection.save(report) if Puppet[:report]
   rescue => detail
     puts detail.backtrace if Puppet[:trace]
     Puppet.err "Could not send report: #{detail}"
@@ -209,22 +208,19 @@ class Puppet::Configurer
   end
 
   def execute_from_setting(setting)
-    return true if (command = Puppet[setting]) == ""
+    return if (command = Puppet[setting]) == ""
 
     begin
       Puppet::Util.execute([command])
-      true
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      Puppet.err "Could not run command from #{setting}: #{detail}"
-      false
+      raise CommandHookError, "Could not run command from #{setting}: #{detail}"
     end
   end
 
   def retrieve_catalog_from_cache(fact_options)
     result = nil
     @duration = thinmark do
-      result = Puppet::Resource::Catalog.find(Puppet[:node_name_value], fact_options.merge(:ignore_terminus => true))
+      result = Puppet::Resource::Catalog.indirection.find(Puppet[:certname], fact_options.merge(:ignore_terminus => true))
     end
     Puppet.notice "Using cached catalog"
     result
@@ -237,7 +233,7 @@ class Puppet::Configurer
   def retrieve_new_catalog(fact_options)
     result = nil
     @duration = thinmark do
-      result = Puppet::Resource::Catalog.find(Puppet[:node_name_value], fact_options.merge(:ignore_cache => true))
+      result = Puppet::Resource::Catalog.indirection.find(Puppet[:certname], fact_options.merge(:ignore_cache => true))
     end
     result
   rescue SystemExit,NoMemoryError