puppet 2.7.9 → 2.7.11

data/lib/puppet/face/instrumentation_data.rb

@@ -0,0 +1,28 @@
+require 'puppet/indirector/face'
+
+Puppet::Indirector::Face.define(:instrumentation_data, '0.0.1') do
+  copyright "Puppet Labs", 2011
+  license   "Apache 2 license; see COPYING"
+
+  summary "Manage instrumentation listener accumulated data."
+  description <<-EOT
+    This subcommand allows to retrieve the various listener data.
+  EOT
+
+  get_action(:destroy).summary "Invalid for this subcommand."
+  get_action(:save).summary "Invalid for this subcommand."
+  get_action(:search).summary "Invalid for this subcommand."
+
+  find = get_action(:find)
+  find.summary "Retrieve listener data."
+  find.render_as = :pson
+  find.returns <<-EOT
+    The data of an instrumentation listener
+  EOT
+  find.examples <<-EOT
+    Retrieve listener data:
+
+    $ puppet instrumentation_data find performance --terminus rest
+  EOT
+
+end

data/lib/puppet/face/instrumentation_listener.rb

@@ -0,0 +1,96 @@
+require 'puppet/indirector/face'
+
+Puppet::Indirector::Face.define(:instrumentation_listener, '0.0.1') do
+  copyright "Puppet Labs", 2011
+  license   "Apache 2 license; see COPYING"
+
+  summary "Manage instrumentation listeners."
+  description <<-EOT
+    This subcommand enables/disables or list instrumentation listeners.
+  EOT
+
+  get_action(:destroy).summary "Invalid for this subcommand."
+
+  find = get_action(:find)
+  find.summary "Retrieve a single listener."
+  find.render_as = :pson
+  find.returns <<-EOT
+    The status of an instrumentation listener
+  EOT
+  find.examples <<-EOT
+    Retrieve a given listener:
+
+    $ puppet instrumentation_listener find performance --terminus rest
+  EOT
+
+  search = get_action(:search)
+  search.summary "Retrieve all instrumentation listeners statuses."
+  search.arguments "<dummy_text>"
+  search.render_as = :pson
+  search.returns <<-EOT
+    The statuses of all instrumentation listeners
+  EOT
+  search.short_description <<-EOT
+    This retrieves all instrumentation listeners
+  EOT
+  search.notes <<-EOT
+    Although this action always returns all instrumentation listeners, it requires a dummy search
+    key; this is a known bug.
+  EOT
+  search.examples <<-EOT
+    Retrieve the state of the listeners running in the remote puppet master:
+
+    $ puppet instrumentation_listener search x --terminus rest
+  EOT
+
+  def manage(name, activate)
+    Puppet::Util::Instrumentation::Listener.indirection.terminus_class = :rest
+    listener = Puppet::Face[:instrumentation_listener, '0.0.1'].find(name)
+    if listener
+      listener.enabled = activate
+      Puppet::Face[:instrumentation_listener, '0.0.1'].save(listener)
+    end
+  end
+
+  action :enable do
+    summary "Enable a given instrumentation listener."
+    arguments "<listener>"
+    returns "Nothing."
+    description <<-EOT
+      Enable a given instrumentation listener. After being enabled the listener
+      will start receiving instrumentation notifications from the probes if those
+      are enabled.
+    EOT
+    examples <<-EOT
+      Enable the "performance" listener in the running master:
+
+      $ puppet instrumentation_listener enable performance --terminus rest
+    EOT
+
+    when_invoked do |name, options|
+      manage(name, true)
+    end
+  end
+
+  action :disable do
+    summary "Disable a given instrumentation listener."
+    arguments "<listener>"
+    returns "Nothing."
+    description <<-EOT
+      Disable a given instrumentation listener. After being disabled the listener
+      will stop receiving instrumentation notifications from the probes.
+    EOT
+    examples <<-EOT
+      Disable the "performance" listener in the running master:
+
+      $ puppet instrumentation_listener disable performance --terminus rest
+    EOT
+
+    when_invoked do |name, options|
+      manage(name, false)
+    end
+  end
+
+  get_action(:save).summary "API only: modify an instrumentation listener status."
+  get_action(:save).arguments "<listener>"
+end

data/lib/puppet/face/instrumentation_probe.rb

@@ -0,0 +1,77 @@
+require 'puppet/indirector/face'
+
+Puppet::Indirector::Face.define(:instrumentation_probe, '0.0.1') do
+  copyright "Puppet Labs", 2011
+  license   "Apache 2 license; see COPYING"
+
+  summary "Manage instrumentation probes."
+  description <<-EOT
+    This subcommand enables/disables or list instrumentation listeners.
+  EOT
+
+  get_action(:find).summary "Invalid for this subcommand."
+
+  search = get_action(:search)
+  search.summary "Retrieve all probe statuses."
+  search.arguments "<dummy_text>"
+  search.render_as = :pson
+  search.returns <<-EOT
+    The statuses of all instrumentation probes
+  EOT
+  search.short_description <<-EOT
+    This retrieves all instrumentation probes
+  EOT
+  search.notes <<-EOT
+    Although this action always returns all instrumentation probes, it requires a dummy search
+    key; this is a known bug.
+  EOT
+  search.examples <<-EOT
+    Retrieve the state of the probes running in the remote puppet master:
+
+    $ puppet instrumentation_probe search x --terminus rest
+  EOT
+
+  action :enable do
+    summary "Enable all instrumentation probes."
+    arguments "<dummy>"
+    returns "Nothing."
+    description <<-EOT
+      Enable all instrumentation probes. After being enabled, all enabled listeners
+      will start receiving instrumentation notifications from the probes.
+    EOT
+    examples <<-EOT
+      Enable the probes for the running master:
+
+      $ puppet instrumentation_probe enable x --terminus rest
+    EOT
+
+    when_invoked do |name, options|
+      Puppet::Face[:instrumentation_probe, '0.0.1'].save(nil)
+    end
+  end
+
+  action :disable do
+    summary "Disable all instrumentation probes."
+    arguments "<dummy>"
+    returns "Nothing."
+    description <<-EOT
+      Disable all instrumentation probes. After being disabled, no listeners
+      will receive instrumentation notifications.
+    EOT
+    examples <<-EOT
+      Disable the probes for the running master:
+
+      $ puppet instrumentation_probe disable x --terminus rest
+    EOT
+
+    when_invoked do |name, options|
+      Puppet::Face[:instrumentation_probe, '0.0.1'].destroy(nil)
+    end
+  end
+
+  get_action(:save).summary "API only: enable all instrumentation probes."
+  get_action(:save).arguments "<dummy>"
+
+  get_action(:destroy).summary "API only: disable all instrumentation probes."
+  get_action(:destroy).arguments "<dummy>"
+end

data/lib/puppet/face/module/list.rb

@@ -0,0 +1,64 @@
+Puppet::Face.define(:module, '1.0.0') do
+  action(:list) do
+    summary "List installed modules"
+    description <<-HEREDOC
+      List puppet modules from a specific environment, specified modulepath or
+      default to listing modules in the default modulepath:
+      #{Puppet.settings[:modulepath]}
+    HEREDOC
+    returns "hash of paths to module objects"
+
+    option "--env ENVIRONMENT" do
+      summary "Which environments' modules to list"
+    end
+
+    option "--modulepath MODULEPATH" do
+      summary "Which directories to look for modules in"
+    end
+
+    examples <<-EOT
+      List installed modules:
+
+      $ puppet module list
+        /etc/puppet/modules
+          bacula (0.0.2)
+        /usr/share/puppet/modules
+          apache (0.0.3)
+          bacula (0.0.1)
+
+      List installed modules from a specified environment:
+
+      $ puppet module list --env 'test'
+        /tmp/puppet/modules
+          rrd (0.0.2)
+
+      List installed modules from a specified modulepath:
+
+      $ puppet module list --modulepath /tmp/facts1:/tmp/facts2
+        /tmp/facts1
+          stdlib
+        /tmp/facts2
+          nginx (1.0.0)
+    EOT
+
+    when_invoked do |options|
+      Puppet[:modulepath] = options[:modulepath] if options[:modulepath]
+      environment = Puppet::Node::Environment.new(options[:env])
+
+      environment.modules_by_path
+    end
+
+    when_rendering :console do |modules_by_path|
+      output = ''
+      modules_by_path.each do |path, modules|
+        output << "#{path}\n"
+        modules.each do |mod|
+          version_string = mod.version ? "(#{mod.version})" : ''
+          output << "  #{mod.name} #{version_string}\n"
+        end
+      end
+      output
+    end
+
+  end
+end

data/lib/puppet/face/module/uninstall.rb

@@ -0,0 +1,50 @@
+Puppet::Face.define(:module, '1.0.0') do
+  action(:uninstall) do
+    summary "Uninstall a puppet module."
+    description <<-EOT
+      Uninstall a puppet module from the modulepath or a specific
+      target directory which defaults to
+      #{Puppet.settings[:modulepath].split(File::PATH_SEPARATOR).join(', ')}.
+    EOT
+
+    returns "Array of strings representing paths of uninstalled files."
+
+    examples <<-EOT
+      Uninstall a module from all directories in the modulepath:
+
+      $ puppet module uninstall ssh
+      Removed /etc/puppet/modules/ssh
+
+      Uninstall a module from a specific directory:
+
+      $ puppet module uninstall --target-directory /usr/share/puppet/modules ssh
+      Removed /usr/share/puppet/modules/ssh
+    EOT
+
+    arguments "<name>"
+
+    option "--target-directory=", "-t=" do
+      default_to { Puppet.settings[:modulepath].split(File::PATH_SEPARATOR) }
+      summary "The target directory to search from modules."
+      description <<-EOT
+        The target directory to search for modules.
+      EOT
+    end
+
+    when_invoked do |name, options|
+
+      if options[:target_directory].is_a?(Array)
+        options[:target_directories] = options[:target_directory]
+      else
+        options[:target_directories] = [ options[:target_directory] ]
+      end
+      options.delete(:target_directory)
+
+      Puppet::Module::Tool::Applications::Uninstaller.run(name, options)
+    end
+
+    when_rendering :console do |removed_modules|
+      removed_modules.map { |path| "Removed #{path}" }.join('\n')
+    end
+  end
+end

data/lib/puppet/face/node/clean.rb

@@ -54,10 +54,7 @@ Puppet::Face.define(:node, '0.0.1') do
     clean_cached_facts(node)
     clean_cached_node(node)
     clean_reports(node)
-
-    # This is roughly functional, but seems to introduce order-dependent test
-    # failures; this can be re-added when those issues are resolved.
-    # clean_storeconfigs(node, unexport)
+    clean_storeconfigs(node, unexport)
   end
 
   # clean signed cert for +host+

data/lib/puppet/feature/base.rb

@@ -23,6 +23,7 @@ Puppet.features.add(:microsoft_windows) do
     require 'win32ole'
     require 'win32/api'
     require 'win32/taskscheduler'
+    require 'puppet/util/windows/security'
     true
   rescue LoadError => err
     warn "Cannot run on Microsoft Windows without the sys-admin, win32-process, win32-dir, win32-service and win32-taskscheduler gems: #{err}" unless Puppet.features.posix?

data/lib/puppet/file_serving/content.rb

@@ -35,7 +35,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
       # This stat can raise an exception, too.
       raise(ArgumentError, "Cannot read the contents of links unless following links") if stat.ftype == "symlink"
 
-      @content = ::File.read(full_path)
+      @content = Puppet::Util.binread(full_path)
     end
     @content
   end

data/lib/puppet/indirector/facts/facter.rb

@@ -7,6 +7,22 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     returns the local host's facts, regardless of what you attempt to find."
 
 
+  # Clear out all of the loaded facts. Reload facter but not puppet facts.
+  # NOTE: This is clumsy and shouldn't be required for later (1.5.x) versions
+  # of Facter.
+  def self.reload_facter
+    Facter.clear
+
+    # Reload everything.
+    if Facter.respond_to? :loadfacts
+      Facter.loadfacts
+    elsif Facter.respond_to? :load
+      Facter.load
+    else
+      Puppet.warning "You should upgrade your version of Facter to at least 1.3.8"
+    end
+  end
+
   def self.load_fact_plugins
     # Add any per-module fact directories to the factpath
     module_fact_dirs = Puppet[:modulepath].split(File::PATH_SEPARATOR).collect do |d|
@@ -15,7 +31,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
       end
     end.flatten
     dirs = module_fact_dirs + Puppet[:factpath].split(File::PATH_SEPARATOR)
-    x = dirs.each do |dir|
+    x = dirs.uniq.each do |dir|
       load_facts_in_dir(dir)
     end
   end
@@ -27,7 +43,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
       Dir.glob("*.rb").each do |file|
         fqfile = ::File.join(dir, file)
         begin
-          Puppet.info "Loading facts in #{::File.basename(file.sub(".rb",''))}"
+          Puppet.info "Loading facts in #{fqfile}"
           Timeout::timeout(self.timeout) do
             load file
           end
@@ -57,17 +73,14 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     timeout
   end
 
-  def initialize(*args)
-    super
-    self.class.load_fact_plugins
-  end
-
   def destroy(facts)
     raise Puppet::DevError, "You cannot destroy facts in the code store; it is only used for getting facts from Facter"
   end
 
   # Look a host's facts up in Facter.
   def find(request)
+    self.class.reload_facter
+    self.class.load_fact_plugins
     result = Puppet::Node::Facts.new(request.key, Facter.to_hash)
 
     result.add_local_facts

data/lib/puppet/indirector/facts/inventory_active_record.rb

@@ -2,6 +2,7 @@ require 'puppet/rails'
 require 'puppet/rails/inventory_node'
 require 'puppet/rails/inventory_fact'
 require 'puppet/indirector/active_record'
+require 'puppet/util/retryaction'
 
 class Puppet::Node::Facts::InventoryActiveRecord < Puppet::Indirector::ActiveRecord
   def find(request)
@@ -13,19 +14,21 @@ class Puppet::Node::Facts::InventoryActiveRecord < Puppet::Indirector::ActiveRec
   end
 
   def save(request)
-    facts = request.instance
-    node = Puppet::Rails::InventoryNode.find_by_name(request.key) || Puppet::Rails::InventoryNode.create(:name => request.key, :timestamp => facts.timestamp)
-    node.timestamp = facts.timestamp
+    Puppet::Util::RetryAction.retry_action :retries => 4, :retry_exceptions => {ActiveRecord::StatementInvalid => 'MySQL Error.  Retrying'} do
+      facts = request.instance
+      node = Puppet::Rails::InventoryNode.find_by_name(request.key) || Puppet::Rails::InventoryNode.create(:name => request.key, :timestamp => facts.timestamp)
+      node.timestamp = facts.timestamp
 
-    ActiveRecord::Base.transaction do
-      Puppet::Rails::InventoryFact.delete_all(:node_id => node.id)
-      # We don't want to save internal values as facts, because those are
-      # metadata that belong on the node
-      facts.values.each do |name,value|
-        next if name.to_s =~ /^_/
-        node.facts.build(:name => name, :value => value)
+      ActiveRecord::Base.transaction do
+        Puppet::Rails::InventoryFact.delete_all(:node_id => node.id)
+        # We don't want to save internal values as facts, because those are
+        # metadata that belong on the node
+        facts.values.each do |name,value|
+          next if name.to_s =~ /^_/
+          node.facts.build(:name => name, :value => value)
+        end
+        node.save
       end
-      node.save
     end
   end