puppet 3.3.2 → 3.4.0.rc1

data/CONTRIBUTING.md

@@ -47,6 +47,28 @@ top of things.
 * Make sure you have added the necessary tests for your changes.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
+## Making Trivial Changes
+
+### Documentation
+
+For changes of a trivial nature to comments and documentation, it is not
+always necessary to create a new ticket in Redmine. In this case, it is
+appropriate to start the first line of a commit with '(doc)' instead of
+a ticket number. 
+
+````
+    (doc) Add documentation commit example to CONTRIBUTING
+
+    There is no example for contributing a documentation commit
+    to the Puppet repository. This is a problem because the contributor
+    is left to assume how a commit of this nature may appear.
+
+    The first line is a real life imperative statement with '(doc)' in
+    place of what would have been the ticket number in a 
+    non-documentation related commit. The body describes the nature of
+    the new documentation or comments added.
+````
+
 ## Submitting Changes
 
 * Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).

data/Gemfile

@@ -1,7 +1,7 @@
-source "https://rubygems.org"
+source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
+  if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
@@ -37,6 +37,14 @@ group(:development, :test) do
   gem "mocha", "~> 0.10.5", :require => false
 
   gem "yarjuf", "~> 1.0"
+
+  # json-schema does not support windows, so use the 'ruby' platform to exclude it on windows
+  platforms :ruby do
+    # json-schema uses multi_json, but chokes with multi_json 1.7.9, so prefer 1.7.7
+    gem "multi_json", "1.7.7", :require => false
+    gem "json-schema", "2.1.1", :require => false
+  end
+
 end
 
 group(:extra) do
@@ -48,6 +56,7 @@ group(:extra) do
   gem "sqlite3", :require => false
   gem "stomp", :require => false
   gem "tzinfo", :require => false
+  gem "msgpack", :require => false
 end
 
 platforms :mswin, :mingw do

data/README.md

@@ -7,32 +7,28 @@ Puppet, an automated administrative engine for your Linux, Unix, and Windows sys
 administrative tasks (such as adding users, installing packages, and updating server
 configurations) based on a centralized specification.
 
-Documentation (and detailed installation instructions) can be found online at the
-[Puppet Docs site](http://docs.puppetlabs.com).
+Documentation
+-------------
 
+Documentation for Puppet and related projects can be found online at the
+[Puppet Docs site](http://docs.puppetlabs.com).
 
 Installation
 ------------
 
-Generally, you need the following things installed:
-
-* A supported Ruby version. Ruby 1.8.7, and 1.9.3 are fully supported.
+The best way to run Puppet is with [Puppet Enterprise](http://puppetlabs.com/puppet/puppet-enterprise),
+which also includes orchestration features, a web console, and professional support.
+[The PE documentation is available here.](http://docs.puppetlabs.com/pe/latest)
 
-* The Ruby OpenSSL library.  For some reason, this often isn't included
-  in the main ruby distributions.  You can test for it by running
-  `ruby -ropenssl -e "puts :yep"`.  If that errors out, you're missing the
-  library.
+To install an open source release of Puppet,
+[see the installation guide on the docs site.](http://docs.puppetlabs.com/guides/installation.html)
 
-  If your distribution doesn't come with the necessary library (e.g., on Debian
-  and Ubuntu you need to install libopenssl-ruby), then you'll probably have to
-  compile Ruby yourself, since it's part of the standard library and not
-  available separately.  You could probably just compile and install that one
-  library, though.
-
-* Facter => 1.6.11 (available via your package manager or from the [Facter site](http://puppetlabs.com/projects/facter)).
+If you need to run Puppet from source as a tester or developer,
+[see the running from source guide on the docs site.](http://docs.puppetlabs.com/guides/from_source.html)
 
 Contributions
 ------
+
 Please see our [Contribution
 Documents](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md)
 and our [Developer
@@ -54,4 +50,4 @@ is an active #puppet channel on Freenode.
 
 HTTP API
 --------
-{file:api_docs/http_api_index.md HTTP API Index}
+{file:api/docs/http_api_index.md HTTP API Index}

data/README_DEVELOPER.md

@@ -693,7 +693,7 @@ When Puppet master is started from Rack, Puppet 3.x will read from
 ~/.puppet/puppet.conf by default.  This is intended behavior.  Rack
 configurations should start Puppet master with an explicit configuration
 directory using `ARGV << "--confdir" << "/etc/puppet"`.  Please see the
-`ext/rack/files/config.ru` file for an up-to-date example.
+`ext/rack/config.ru` file for an up-to-date example.
 
 # Determining the Puppet Version
 

data/Rakefile

@@ -64,5 +64,5 @@ task :default do
 end
 
 task :spec do
-  sh %{rspec -fd spec}
+  sh %{rspec spec}
 end

data/examples/hiera/README.md

@@ -24,7 +24,7 @@ Module from forge with module defaults
 
 <pre>
 $ mv modules/data modules/data.bak
-$ puppet --config etc/puppet.conf --libdir ../lib site.pp
+$ puppet apply --config etc/puppet.conf site.pp
 notice: /Stage[main]/Ntp::Config/File[/tmp/ntp.conf]/ensure: defined content as '{md5}7045121976147a932a66c7671939a9ad'
 notice: /Stage[main]/Users::Common/Notify[Adding users::common]/message: defined 'message' as 'Adding users::common'
 $ cat /tmp/ntp.conf
@@ -40,7 +40,7 @@ Site wide override data in _data::common_
 
 <pre>
 $ mv modules/data.bak modules/data
-$ puppet --config etc/puppet.conf --libdir ../lib site.pp
+$ puppet apply --config etc/puppet.conf site.pp
 notice: /Stage[main]/Ntp::Config/File[/tmp/ntp.conf]/content: content changed '{md5}7045121976147a932a66c7671939a9addc2' to '{md5}8f9039fe1989a278a0a8e1836acb8d23'
 notice: /Stage[main]/Users::Common/Notify[Adding users::common]/message: defined 'message' as 'Adding users::common'
 $ cat /tmp/ntp.conf
@@ -56,7 +56,7 @@ Fact driven overrides for location=dc1
  * The _hiera_include()_ function includes _users::common_ and _users::dc1_ as the data file for dc1 adds that
 
 <pre>
-$ FACTER_location=dc1 puppet --config etc/puppet.conf --libdir ../lib site.pp
+$ FACTER_location=dc1 puppet apply --config etc/puppet.conf site.pp
 notice: /Stage[main]/Ntp::Config/File[/tmp/ntp.conf]/content: content changed '{md5}8f9039fe1989a278a0a8e1836acb8d23' to '{md5}074d0e2ac727f6cb9afe3345d574b578'
 notice: /Stage[main]/Users::Common/Notify[Adding users::common]/message: defined 'message' as 'Adding users::common'
 notice: /Stage[main]/Users::Dc1/Notify[Adding users::dc1]/message: defined 'message' as 'Adding users::dc1'
@@ -69,7 +69,7 @@ Now simulate a machine in _dc2_, because there is no data for dc2 it uses the si
 does not include the _users::dc1_ class anymore
 
 <pre>
-$ FACTER_location=dc2 puppet --config etc/puppet.conf --libdir ../lib site.pp
+$ FACTER_location=dc2 puppet apply --config etc/puppet.conf site.pp
 warning: Could not find class data::dc2 for nephilim.ml.org
 notice: /Stage[main]/Ntp::Config/File[/tmp/ntp.conf]/content: content changed '{md5}074d0e2ac727f6cb9afe3345d574b578' to '{md5}8f9039fe1989a278a0a8e1836acb8d23'
 notice: /Stage[main]/Users::Common/Notify[Adding users::common]/message: defined 'message' as 'Adding users::common'

data/ext/debian/puppetmaster.init

@@ -100,6 +100,7 @@ status_puppet_master() {
     else
         echo ""
         echo "puppetmaster not configured to start"
+        status_of_proc -p "/var/run/puppet/${NAME}.pid" "${DAEMON}" "${NAME}"
     fi
 }
 

data/ext/debian/rules

@@ -66,14 +66,11 @@ install: build
 	$(INSTALL) -m0644 ext/emacs/puppet-mode.el			\
 		$(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
 
-	# Install the rack README as README.rack
-	$(INSTALL) -m0644 ext/rack/README \
-		$(CURDIR)/debian/puppetmaster-passenger/usr/share/doc/puppetmaster-passenger/README.rack
 	# Install the config.ru
-	$(INSTALL) -m0644 ext/rack/files/config.ru \
+	$(INSTALL) -m0644 ext/rack/config.ru \
 		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppet/rack/puppetmasterd
 	# Install apache2 site configuration template
-	$(INSTALL) -m0644 ext/rack/files/apache2.conf \
+	$(INSTALL) -m0644 ext/rack/example-passenger-vhost.conf \
 		$(CURDIR)/debian/puppetmaster-passenger/usr/share/puppetmaster-passenger/apache2.site.conf.tmpl
 
 	# Add ext directory

data/ext/nagios/check_puppet.rb

@@ -99,16 +99,16 @@ class CheckPuppet
       process = "process #{OPTIONS[:process]} is not running"
     end
 
-    case @proc or @file
-    when 0
-      status = "OK"
-      exitcode = 0
-    when 2
+    case
+    when (@proc == 2 or @file == 2)
       status = "CRITICAL"
       exitcode = 2
-    when 3
+    when (@proc == 0 and @file == 0)
+      status = "OK"
+      exitcode = 0
+    else
       status = "UNKNOWN"
-      exitcide = 3
+      exitcode = 3
     end
 
     puts "PUPPET #{status}: #{process}, #{state}"

data/ext/osx/file_mapping.yaml

@@ -1,6 +1,6 @@
 directories:
   lib:
-    path: 'usr/lib/ruby/site_ruby/1.8'
+    path: 'Library/Ruby/Site'
     owner: 'root'
     group: 'wheel'
     perms: '0644'

data/ext/osx/preflight.erb

@@ -8,30 +8,45 @@
 # ${3} is the destination volume so that this works correctly
 # when being installed to volumes other than the current OS.
 
-<% begin %>
-<% require 'rubygems' %>
-<% rescue LoadError %>
-<% end %>
-<% require 'rake' %>
+<%- ["@apple_libdir", "@apple_sbindir", "@apple_bindir", "@apple_docdir", "@package_name"].each do |i| -%>
+  <%- val = instance_variable_get(i) -%>
+  <%- raise "Critical variable #{i} is unset!" if val.nil? or val.empty? -%>
+<%- end -%>
 
-<% Dir.chdir("lib") %>
-<% FileList["**/*"].select {|i| File.file?(i)}.each do |file| %>
-/bin/rm -Rf "${3}<%= @apple_libdir %>/<%=file%>"
-<% end %>
+# remove ruby library files. Because hiera and puppet both place a "hiera"
+# directory in the libdir, we have to be sure we only delete the files
+# belonging to this project. In this case, we only delete files from within
+# the 'hiera' directory, while deleting the entire puppet directory.
+<%- Dir.chdir("lib") do -%>
+  <%- [@apple_old_libdir, @apple_libdir].compact.each do |libdir| -%>
+    <%- Dir["hiera/**/*"].select{ |i| File.file?(i) }.each do |file| -%>
+/bin/rm -f "${3}<%= libdir %>/<%= file %>"
+    <%- end -%>
+    <%- Dir.glob("*").each do |file| -%>
+      <%- next if file == "hiera" -%>
+      <%- if File.directory?(file) -%>
+/bin/rm -Rf "${3}<%= libdir %>/<%= file %>"
+      <%- else -%>
+/bin/rm -f "${3}<%= libdir %>/<%= file %>"
+      <%- end -%>
+    <%- end -%>
+  <%- end -%>
+<%- end -%>
 
-<% Dir.chdir("../bin") %>
-<% FileList["**/*"].select {|i| File.file?(i)}.each do |file| %>
-/bin/rm -Rf "${3}<%= @apple_bindir %>/<%=file%>"
-<% end %>
-<% Dir.chdir("..") %>
+# remove bin files
+<%- Dir.chdir("bin") do -%>
+    <%- Dir.glob("*").each do |file| -%>
+/bin/rm -f "${3}<%= @apple_bindir %>/<%= file %>"
+  <%- end -%>
+<%- end -%>
 
 # remove old doc files
 /bin/rm -Rf "${3}<%= @apple_docdir %>/<%= @package_name %>"
 
 # These files used to live in the sbindir but were
 # removed in Pupppet >= 3.0. Remove them
-/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetca"
-/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetd"
-/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetmasterd"
-/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetqd"
-/bin/rm -Rf "${3}<%= @apple_sbindir %>/puppetrun"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetca"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetd"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetmasterd"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetqd"
+/bin/rm -f "${3}<%= @apple_sbindir %>/puppetrun"

data/ext/rack/{files/apache2.conf → example-passenger-vhost.conf}

@@ -1,3 +1,9 @@
+# This Apache 2 virtual host config shows how to use Puppet as a Rack
+# application via Passenger. See
+# http://docs.puppetlabs.com/guides/passenger.html for more information.
+
+# You can also use the included config.ru file to run Puppet with other Rack
+# servers instead of Passenger.
 
 # you probably want to tune these settings
 PassengerHighPerformance on

data/ext/redhat/puppet.spec.erb

@@ -122,7 +122,8 @@ install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 %if 0%{?_with_systemd}
 # Systemd for fedora >= 17
 %{__install} -d -m0755  %{buildroot}%{_unitdir}
-install -Dp -m0644 ext/systemd/puppetagent.service %{buildroot}%{_unitdir}/puppetagent.service
+install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service
+ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service
 install -Dp -m0644 ext/systemd/puppetmaster.service %{buildroot}%{_unitdir}/puppetmaster.service
 %else
 # Otherwise init.d for fedora < 17 or el 5, 6
@@ -189,6 +190,7 @@ cp -pr ext/puppet-nm-dispatcher \
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
 %if 0%{?_with_systemd}
+%{_unitdir}/puppet.service
 %{_unitdir}/puppetagent.service
 %else
 %{_initrddir}/puppet
@@ -289,7 +291,7 @@ if [ "$1" -ge 1 ]; then
   newpid="%{_localstatedir}/run/puppet/agent.pid"
   if [ -s "$oldpid" -a ! -s "$newpid" ]; then
     (kill $(< "$oldpid") && rm -f "$oldpid" && \
-      /bin/systemctl start puppetagent.service) >/dev/null 2>&1 || :
+      /bin/systemctl start puppet.service) >/dev/null 2>&1 || :
   fi
 fi
 %else
@@ -303,6 +305,15 @@ if [ "$1" -ge 1 ]; then
     (kill $(< "$oldpid") && rm -f "$oldpid" && \
       /sbin/service puppet start) >/dev/null 2>&1 || :
   fi
+
+  # If an old puppet process (one whose binary is located in /sbin) is running,
+  # kill it and then start up a fresh with the new binary.
+  if [ -e "$newpid" ]; then
+    if ps aux | grep `cat "$newpid"` | grep -v grep | awk '{ print $12 }' | grep -q sbin; then
+      (kill $(< "$newpid") && rm -f "$newpid" && \
+        /sbin/service puppet start) >/dev/null 2>&1 || :
+    fi
+  fi
 fi
 %endif
 
@@ -338,7 +349,9 @@ fi
 if [ "$1" -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable puppet.service > /dev/null 2>&1 || :
     /bin/systemctl stop puppetagent.service > /dev/null 2>&1 || :
+    /bin/systemctl stop puppet.service > /dev/null 2>&1 || :
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 %else
@@ -394,6 +407,11 @@ rm -rf %{buildroot}
 * <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
 - Build for <%= @version %>
 
+* Wed Oct 2 2013 Jason Antman <jason@jasonantman.com>
+- Move systemd service and unit file names back to "puppet" from erroneous "puppetagent"
+- Add symlink to puppetagent unit file for compatibility with current bug
+- Alter package removal actions to deactivate and stop both service names
+
 * Thu Jun 27 2013 Matthaus Owens <matthaus@puppetlabs.com> - 3.2.3-0.1rc0
 - Bump requires on ruby-rgen to 0.6.5
 

data/lib/hiera_puppet.rb

@@ -71,12 +71,12 @@ module HieraPuppet
 
     if Puppet.settings[:hiera_config].is_a?(String)
       expanded_config_file = File.expand_path(Puppet.settings[:hiera_config])
-      if File.exist?(expanded_config_file)
+      if Puppet::FileSystem::File.exist?(expanded_config_file)
         config_file = expanded_config_file
       end
     elsif Puppet.settings[:confdir].is_a?(String)
       expanded_config_file = File.expand_path(File.join(Puppet.settings[:confdir], '/hiera.yaml'))
-      if File.exist?(expanded_config_file)
+      if Puppet::FileSystem::File.exist?(expanded_config_file)
         config_file = expanded_config_file
       end
     end

data/lib/puppet/agent.rb

@@ -1,4 +1,3 @@
-require 'sync'
 require 'puppet/application'
 
 # A general class for triggering a run of another
@@ -42,7 +41,7 @@ class Puppet::Agent
         with_client do |client|
           begin
             client_args = client_options.merge(:pluginsync => Puppet[:pluginsync])
-            sync.synchronize { lock { client.run(client_args) } }
+            lock { client.run(client_args) }
           rescue SystemExit,NoMemoryError
             raise
           rescue Exception => detail
@@ -76,10 +75,6 @@ class Puppet::Agent
     @splayed = true
   end
 
-  def sync
-    @sync ||= Sync.new
-  end
-
   def run_in_fork(forking = true)
     return yield unless forking or Puppet.features.windows?
 

data/lib/puppet/application.rb

@@ -381,18 +381,31 @@ class Application
       Puppet::Util::Log.newdestination(:console)
     end
 
+    set_log_level
+
+    Puppet::Util::Log.setup_default unless options[:setdest]
+  end
+
+  def set_log_level
     if options[:debug]
       Puppet::Util::Log.level = :debug
     elsif options[:verbose]
       Puppet::Util::Log.level = :info
     end
+  end
 
-    Puppet::Util::Log.setup_default unless options[:setdest]
+  def handle_logdest_arg(arg)
+    begin
+      Puppet::Util::Log.newdestination(arg)
+      options[:setdest] = true
+    rescue => detail
+      Puppet.log_exception(detail)
+    end
   end
 
   def configure_indirector_routes
     route_file = Puppet[:route_file]
-    if ::File.exists?(route_file)
+    if Puppet::FileSystem::File.exist?(route_file)
       routes = YAML.load_file(route_file)
       application_routes = routes[name.to_s]
       Puppet::Indirector.configure_routes(application_routes) if application_routes

data/lib/puppet/application/agent.rb

@@ -67,12 +67,7 @@ class Puppet::Application::Agent < Puppet::Application
   end
 
   option("--logdest DEST", "-l DEST") do |arg|
-    begin
-      Puppet::Util::Log.newdestination(arg)
-      options[:setdest] = true
-    rescue => detail
-      Puppet.log_exception(detail)
-    end
+    handle_logdest_arg(arg)
   end
 
   option("--waitforcert WAITFORCERT", "-w") do |arg|
@@ -442,7 +437,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   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])
+    unless Puppet::FileSystem::File.exist?(Puppet[:rest_authconfig])
       Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}"
       exit(14)
     end