puppet 3.2.4 → 3.3.0.rc2

data/Rakefile

@@ -72,4 +72,8 @@ namespace "ci" do
     ENV["LOG_SPEC_ORDER"] = "true"
     sh %{rspec -r yarjuf -f JUnit -o result.xml -fd spec}
   end
+
+  task :el6tests do
+    sh "cd acceptance/config/el6; rm -f el6.tar.gz; tar -czvf el6.tar.gz *"
+  end
 end

data/ext/build_defaults.yaml

@@ -10,13 +10,14 @@ gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
 final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-fedora-17-i386 pl-fedora-18-i386 pl-fedora-19-i386'
-yum_host: 'burji.puppetlabs.com'
+yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE
 build_dmg: TRUE
-apt_host: 'burji.puppetlabs.com'
+apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 ips_repo: '/var/pkgrepo'
 ips_store: '/opt/repository'
 ips_host: 'solaris-11-ips-repo.acctest.dc1.puppetlabs.net'
+tar_host: 'downloads.puppetlabs.com'

data/ext/debian/puppet-common.manpages

@@ -1,3 +1,35 @@
 man/man5/puppet.conf.5
-man/man8/puppet.8
 man/man8/extlookup2hiera.8
+man/man8/puppet.8
+man/man8/puppet-agent.8
+man/man8/puppet-apply.8
+man/man8/puppet-catalog.8
+man/man8/puppet-cert.8
+man/man8/puppet-certificate.8
+man/man8/puppet-certificate_request.8
+man/man8/puppet-certificate_revocation_list.8
+man/man8/puppet-config.8
+man/man8/puppet-describe.8
+man/man8/puppet-device.8
+man/man8/puppet-doc.8
+man/man8/puppet-facts.8
+man/man8/puppet-file.8
+man/man8/puppet-filebucket.8
+man/man8/puppet-help.8
+man/man8/puppet-inspect.8
+man/man8/puppet-instrumentation_data.8
+man/man8/puppet-instrumentation_listener.8
+man/man8/puppet-instrumentation_probe.8
+man/man8/puppet-key.8
+man/man8/puppet-kick.8
+man/man8/puppet-man.8
+man/man8/puppet-module.8
+man/man8/puppet-node.8
+man/man8/puppet-parser.8
+man/man8/puppet-plugin.8
+man/man8/puppet-queue.8
+man/man8/puppet-report.8
+man/man8/puppet-resource.8
+man/man8/puppet-resource_type.8
+man/man8/puppet-secret_agent.8
+man/man8/puppet-status.8

data/ext/gentoo/init.d/puppet

@@ -10,7 +10,7 @@ depend() {
 
 checkconfig() {
         if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
-               eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+               eerror "Please make sure PUPPET_PID_DIR is defined and points to an existing directory"
                return 1
         fi
 

data/ext/gentoo/init.d/puppetmaster

@@ -10,7 +10,7 @@ depend() {
 
 checkconfig() {
     if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
-        eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
+        eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to an existing directory"
         return 1
     fi
 

data/ext/redhat/puppet.spec.erb

@@ -98,7 +98,6 @@ The server can also function as a certificate authority and file server.
 
 %prep
 %setup -q -n %{name}-%{realversion}
-patch -s -p1 < ext/redhat/rundir-perms.patch
 
 
 %build

data/install.rb

@@ -107,6 +107,7 @@ end
 
 def do_libs(libs, strip = 'lib/')
   libs.each do |lf|
+    next if File.directory? lf
     olf = File.join(InstallOptions.site_dir, lf.sub(/^#{strip}/, ''))
     op = File.dirname(olf)
     if $haveftools
@@ -414,7 +415,7 @@ FileUtils.cd File.dirname(__FILE__) do
   rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
   ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
   man   = glob(%w{man/man[0-9]/*})
-  libs  = glob(%w{lib/**/*.rb lib/**/*.erb lib/**/*.py lib/puppet/util/command_line/*})
+  libs  = glob(%w{lib/**/*})
 
   check_prereqs
   prepare_installation

data/lib/hiera/backend/puppet_backend.rb

@@ -48,7 +48,7 @@ class Hiera
 
         Hiera.debug("Looking up #{key} in Puppet backend")
 
-        include_class = Puppet::Parser::Functions.function(:include)
+        Puppet::Parser::Functions.function(:include)
         loaded_classes = scope.catalog.classes
 
         hierarchy(scope, order_override).each do |klass|

data/lib/puppet/application.rb

@@ -87,7 +87,7 @@ module Puppet
 #
 # === Setup
 # Applications can use the setup block to perform any initialization.
-# The defaul +setup+ behaviour is to: read Puppet configuration and manage log level and destination
+# The default +setup+ behaviour is to: read Puppet configuration and manage log level and destination
 #
 # === What and how to run
 # If the +dispatch+ block is defined it is called. This block should return the name of the registered command
@@ -97,7 +97,7 @@ module Puppet
 # === Execution state
 # The class attributes/methods of Puppet::Application serve as a global place to set and query the execution
 # status of the application: stopping, restarting, etc.  The setting of the application status does not directly
-# aftect its running status; it's assumed that the various components within the application will consult these
+# affect its running status; it's assumed that the various components within the application will consult these
 # settings appropriately and affect their own processing accordingly.  Control operations (signal handlers and
 # the like) should set the status appropriately to indicate to the overall system that it's the process of
 # stopping or restarting (or just running as usual).
@@ -377,13 +377,14 @@ class Application
   end
 
   def setup_logs
-    if options[:debug] or options[:verbose]
+    if options[:debug] || options[:verbose]
       Puppet::Util::Log.newdestination(:console)
-      if options[:debug]
-        Puppet::Util::Log.level = :debug
-      else
-        Puppet::Util::Log.level = :info
-      end
+    end
+
+    if options[:debug]
+      Puppet::Util::Log.level = :debug
+    elsif options[:verbose]
+      Puppet::Util::Log.level = :info
     end
 
     Puppet::Util::Log.setup_default unless options[:setdest]
@@ -402,7 +403,7 @@ class Application
     # Create an option parser
     option_parser = OptionParser.new(self.class.banner)
 
-    # He're we're building up all of the options that the application may need to handle.  The main
+    # Here we're building up all of the options that the application may need to handle.  The main
     # puppet settings defined in "defaults.rb" have already been parsed once (in command_line.rb) by
     # the time we get here; however, our app may wish to handle some of them specially, so we need to
     # make the parser aware of them again.  We might be able to make this a bit more efficient by

data/lib/puppet/application/agent.rb

@@ -1,12 +1,12 @@
 require 'puppet/application'
 require 'puppet/run'
+require 'puppet/daemon'
+require 'puppet/util/pidlock'
 
 class Puppet::Application::Agent < Puppet::Application
 
   run_mode :agent
 
-  attr_accessor :args, :agent, :daemon, :host
-
   def app_defaults
     super.merge({
       :catalog_terminus => :rest,
@@ -28,7 +28,6 @@ class Puppet::Application::Agent < Puppet::Application
       :detailed_exitcodes => false,
       :verbose => false,
       :debug => false,
-      :centrallogs => false,
       :setdest => false,
       :enable => false,
       :disable => false,
@@ -42,14 +41,9 @@ class Puppet::Application::Agent < Puppet::Application
       options[opt] = val
     end
 
-    @args = {}
-    require 'puppet/daemon'
-    @daemon = Puppet::Daemon.new
-    @daemon.argv = ARGV.dup
+    @argv = ARGV.dup
   end
 
-  option("--centrallogging")
-
   option("--disable [MESSAGE]") do |message|
     options[:disable] = true
     options[:disable_message] = message
@@ -85,10 +79,6 @@ class Puppet::Application::Agent < Puppet::Application
     options[:waitforcert] = arg.to_i
   end
 
-  option("--port PORT","-p") do |arg|
-    @args[:Port] = arg
-  end
-
   def help
     <<-'HELP'
 
@@ -323,12 +313,25 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def run_command
-    return fingerprint if options[:fingerprint]
-    return onetime if Puppet[:onetime]
-    main
+    if options[:fingerprint]
+      fingerprint
+    else
+      # It'd be nice to daemonize later, but we have to daemonize before
+      # waiting for certificates so that we don't block
+      daemon = daemonize_process_when(Puppet[:daemonize])
+
+      wait_for_certificates
+
+      if Puppet[:onetime]
+        onetime(daemon)
+      else
+        main(daemon)
+      end
+    end
   end
 
   def fingerprint
+    host = Puppet::SSL::Host.new
     unless cert = host.certificate || host.certificate_request
       $stderr.puts "Fingerprint asked but no certificate nor certificate request have yet been issued"
       exit(1)
@@ -340,22 +343,26 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     puts digest.to_s
   end
 
-  def onetime
+  def onetime(daemon)
+    if Puppet[:listen]
+      Puppet.notice "Ignoring --listen on onetime run"
+    end
+
     unless options[:client]
-      $stderr.puts "onetime is specified but there is no client"
+      Puppet.err "onetime is specified but there is no client"
       exit(43)
       return
     end
 
-    @daemon.set_signal_traps
+    daemon.set_signal_traps
 
     begin
-      exitstatus = @agent.run
+      exitstatus = daemon.agent.run
     rescue => detail
       Puppet.log_exception(detail)
     end
 
-    @daemon.stop(:exit => false)
+    daemon.stop(:exit => false)
 
     if not exitstatus
       exit(1)
@@ -366,10 +373,13 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     end
   end
 
-  def main
+  def main(daemon)
+    if Puppet[:listen]
+      setup_listen(daemon)
+    end
     Puppet.notice "Starting Puppet client version #{Puppet.version}"
 
-    @daemon.start
+    daemon.start
   end
 
   # Enable all of the most common test options.
@@ -384,6 +394,43 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     options[:detailed_exitcodes] = true
   end
 
+  def setup
+    setup_test if options[:test]
+
+    setup_logs
+
+    exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
+
+    if options[:fqdn]
+      Puppet[:certname] = options[:fqdn]
+    end
+
+    Puppet.settings.use :main, :agent, :ssl
+
+    # Always ignoreimport for agent. It really shouldn't even try to import,
+    # but this is just a temporary band-aid.
+    Puppet[:ignoreimport] = true
+
+    Puppet::Transaction::Report.indirection.terminus_class = :rest
+    # we want the last report to be persisted locally
+    Puppet::Transaction::Report.indirection.cache_class = :yaml
+
+    if Puppet[:catalog_cache_terminus]
+      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
+    end
+
+    if options[:fingerprint]
+      # in fingerprint mode we just need
+      # access to the local files and we don't need a ca
+      Puppet::SSL::Host.ca_location = :none
+    else
+      Puppet::SSL::Host.ca_location = :remote
+      setup_agent
+    end
+  end
+
+  private
+
   def enable_disable_client(agent)
     if options[:enable]
       agent.enable
@@ -393,7 +440,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     exit(0)
   end
 
-  def setup_listen
+  def setup_listen(daemon)
     Puppet.warning "Puppet --listen / kick is deprecated. See http://links.puppetlabs.com/puppet-kick-deprecation"
     unless FileTest.exists?(Puppet[:rest_authconfig])
       Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}"
@@ -404,87 +451,34 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # No REST handlers yet.
     server = Puppet::Network::Server.new(Puppet[:bindaddress], Puppet[:puppetport])
 
-    @daemon.server = server
-  end
-
-  def setup_host
-    @host = Puppet::SSL::Host.new
-    waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : Puppet[:waitforcert])
-    cert = @host.wait_for_cert(waitforcert) unless options[:fingerprint]
+    daemon.server = server
   end
 
   def setup_agent
-    # We need tomake the client either way, we just don't start it
+    # We need to make the client either way, we just don't start it
     # if --no-client is set.
     require 'puppet/agent'
     require 'puppet/configurer'
-    @agent = Puppet::Agent.new(Puppet::Configurer, (not(Puppet[:onetime])))
-
-    enable_disable_client(@agent) if options[:enable] or options[:disable]
+    agent = Puppet::Agent.new(Puppet::Configurer, (not(Puppet[:onetime])))
 
-    @daemon.agent = agent if options[:client]
+    enable_disable_client(agent) if options[:enable] or options[:disable]
 
-    # It'd be nice to daemonize later, but we have to daemonize before the
-    # waitforcert happens.
-    @daemon.daemonize if Puppet[:daemonize]
-
-    setup_host
-
-    @objects = []
-
-    # This has to go after the certs are dealt with.
-    if Puppet[:listen]
-      unless Puppet[:onetime]
-        setup_listen
-      else
-        Puppet.notice "Ignoring --listen on onetime run"
-      end
-    end
+    @agent = agent if options[:client]
   end
 
-  def setup
-    setup_test if options[:test]
-
-    setup_logs
-
-    exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
-
-    args[:Server] = Puppet[:server]
-    if options[:fqdn]
-      args[:FQDN] = options[:fqdn]
-      Puppet[:certname] = options[:fqdn]
-    end
-
-    if options[:centrallogs]
-      logdest = args[:Server]
-
-      logdest += ":" + args[:Port] if args.include?(:Port)
-      Puppet::Util::Log.newdestination(logdest)
-    end
-
-    Puppet.settings.use :main, :agent, :ssl
-
-    # Always ignoreimport for agent. It really shouldn't even try to import,
-    # but this is just a temporary band-aid.
-    Puppet[:ignoreimport] = true
-
-    # We need to specify a ca location for all of the SSL-related i
-    # indirected classes to work; in fingerprint mode we just need
-    # access to the local files and we don't need a ca.
-    Puppet::SSL::Host.ca_location = options[:fingerprint] ? :none : :remote
+  def daemonize_process_when(should_daemonize)
+    daemon = Puppet::Daemon.new(Puppet::Util::Pidlock.new(Puppet[:pidfile]))
+    daemon.argv = @argv
+    daemon.agent = @agent
 
-    Puppet::Transaction::Report.indirection.terminus_class = :rest
-    # we want the last report to be persisted locally
-    Puppet::Transaction::Report.indirection.cache_class = :yaml
+    daemon.daemonize if should_daemonize
 
-    if Puppet[:catalog_cache_terminus]
-      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
-    end
+    daemon
+  end
 
-    unless options[:fingerprint]
-      setup_agent
-    else
-      setup_host
-    end
+  def wait_for_certificates
+    host = Puppet::SSL::Host.new
+    waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : Puppet[:waitforcert])
+    host.wait_for_cert(waitforcert)
   end
 end

data/lib/puppet/application/apply.rb

@@ -239,8 +239,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     Puppet::Util::Log.newdestination(:console) unless options[:logset]
-    client = nil
-    server = nil
 
     Signal.trap(:INT) do
       $stderr.puts "Exiting"