puppet 3.1.1 → 3.2.0.rc1

data/Rakefile

@@ -57,12 +57,16 @@ if File.exist?(build_defs_file)
 end
 
 task :default do
-    sh %{rake -T}
+  sh %{rake -T}
 end
 
-if defined?(RSpec::Core::RakeTask)
-  RSpec::Core::RakeTask.new do |t|
-      t.pattern ='spec/{unit,integration}/**/*.rb'
-      t.fail_on_error = true
+task :spec do
+  sh %{rspec -fd spec}
+end
+
+namespace "ci" do
+  task :spec do
+    ENV["LOG_SPEC_ORDER"] = "true"
+    sh %{rspec -r yarjuf -f JUnit -o result.xml -fd spec}
   end
 end

data/ext/build_defaults.yaml

@@ -2,15 +2,14 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-5-i386 pl-6-i386 fedora-16-i386 fedora-17-i386'
-rc_mocks: 'pl-5-i386-dev pl-6-i386-dev fedora-16-i386-dev fedora-17-i386-dev'
+final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-fedora-17-i386 pl-fedora-18-i386'
 yum_host: 'burji.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/ext/debian/changelog.erb

@@ -4,6 +4,12 @@ puppet (<%= @debversion %>) hardy lucid natty oneiric unstable sid squeeze wheez
 
  -- Puppet Labs Release <info@puppetlabs.com>  <%= Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")%>
 
+puppet (3.2.0-0.1rc0puppetlabs1) lucid oneiric precise unstable sid squeeze wheezy precise; urgency=low
+
+  * Add ruby-rgen dependency for new parser in Puppet 3.2
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Fri, 12 Apr 2013 14:45:14 +0000
+
 puppet (3.1.0-0.1rc1puppetlabs1) lucid natty oneiric precise unstable sid squeeze wheezy precise; urgency=low
 
   * Add extlookup2hiera manpage to puppet-common.manpages

data/ext/debian/control

@@ -11,9 +11,9 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8 | ruby-shadow , libaugeas-ruby1.8 | libaugeas-ruby1.9, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.6.12)
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby, ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.6.12), ruby-rgen
 Recommends: lsb-release, debconf-utils
-Suggests: libselinux-ruby1.8 | ruby-selinux, librrd-ruby1.8 | librrd-ruby1.9
+Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)
 Provides: hiera-puppet
 Conflicts: hiera-puppet
@@ -62,7 +62,7 @@ Replaces: puppetmaster (<< 2.6.1~rc2-1)
 Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8,
  rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus
 Description: Puppet master common scripts
- This package contains common scripts for the puppet master, 
+ This package contains common scripts for the puppet master,
  which is the server hosting manifests and files for the puppet nodes.
  .
  Puppet lets you centrally manage every important aspect of your system
@@ -80,8 +80,8 @@ Package: puppetmaster
 Architecture: all
 Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.6.12), lsb-base
 Breaks: puppet (<< 0.24.7-1)
-Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, libstomp-ruby1.8 | ruby-stomp,
- rdoc, libldap-ruby1.8 | ruby-ldap, puppetdb-terminus
+Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8,
+ rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus
 Description: Centralized configuration management - master startup and compatibility scripts
  This package contains the startup and compatibility scripts for the puppet
  master, which is the server hosting manifests and files for the puppet nodes.
@@ -136,7 +136,7 @@ Description: syntax highlighting for puppet manifests in emacs
 
 Package: puppet-testsuite
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${source:Version}), facter (>= 1.6.12), lsb-base, rails (>= 1.2.3-2), rdoc, libldap-ruby1.8 | ruby-ldap, librspec-ruby | ruby-rspec, git-core, libmocha-ruby1.8 | ruby-mocha
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${source:Version}), facter (>= 1.6.12), lsb-base, rails (>= 1.2.3-2), rdoc, ruby-ldap | libldap-ruby1.8, ruby-rspec | librspec-ruby, git-core, ruby-mocha | libmocha-ruby1.8
 Recommends: cron
 Description: Centralized configuration management - test suite
  This package provides all the tests from the upstream puppet source code.

data/ext/envpuppet

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 #
 # Jeff McCune <jeff@puppetlabs.com>
 # 2010-10-20
@@ -34,7 +34,7 @@
 set -e
 set -u
 
-if [[ "${1:-}" == "--help" ]]; then
+if [ "${1:-}" = "--help" ]; then
   cat <<EO_HELP
 This command reconfigures the environment once for development.
 It is designed to wrap around any other command, specifically puppet
@@ -99,7 +99,7 @@ myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/facter/lib"
 mypath="${mypath}:${ENVPUPPET_BASEDIR}/hiera/bin"
 myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/hiera/lib"
 
-if [[ "${ENVPUPPET_BLEEDING:-}" == "true" ]]; then
+if [ "${ENVPUPPET_BLEEDING:-}" = "true" ]; then
   # git://github.com/puppetlabs/facter.git
   mypath="${mypath}:${ENVPUPPET_BASEDIR}/puppet-interfaces/bin"
   myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-interfaces/lib"
@@ -126,7 +126,7 @@ export ENVPUPPET_OLD_RUBYLIB="${RUBYLIB:-}"
 export PATH="${mypath%%:}"
 export RUBYLIB="${myrubylib%%:}"
 
-if [[ $# -eq 0 ]]; then
+if [ $# -eq 0 ]; then
   echo "export ENVPUPPET_OLD_PATH='${ENVPUPPET_OLD_PATH}'"
   echo "export ENVPUPPET_OLD_RUBYLIB='${ENVPUPPET_OLD_RUBYLIB}'"
   echo "export ENVPUPPET_BASEDIR='${ENVPUPPET_BASEDIR}'"

data/ext/project_data.yaml

@@ -17,6 +17,7 @@ gem_forge_project: 'puppet'
 gem_runtime_dependencies:
   facter: '~> 1.6'
   hiera: '~> 1.0'
+  rgen: '~> 0.6'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"

data/ext/puppet-nm-dispatcher

@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Restart puppet on network changes to pickup changes to /etc/resolv.conf
+#
+# https://projects.puppetlabs.com/issues/2776
+# https://bugzilla.redhat.com/532085
+
+
+if [ -f "/bin/systemctl" ]  ; then
+  [[ $2 =~ ^(up|down)$ ]] && /bin/systemctl try-restart puppet.service || :
+else
+  [[ $2 =~ ^(up|down)$ ]] && /sbin/service puppet condrestart || :
+fi

data/ext/redhat/puppet.spec.erb

@@ -56,6 +56,7 @@ Requires:       facter >= 1.6.11
 # Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
 Requires:       ruby >= 1.8.7
 Requires:       hiera >= 1.0.0
+Requires:       ruby-rgen
 Obsoletes:      hiera-puppet < 1.0.0
 Provides:       hiera-puppet >= 1.0.0
 %{!?_without_augeas:Requires: ruby-augeas}
@@ -168,12 +169,22 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 # Create puppet modules directory for puppet module tool
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
+
+# Install a NetworkManager dispatcher script to pickup changes to
+# # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
+mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
+cp -pr ext/puppet-nm-dispatcher \
+  %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name}
+
 %files
 %defattr(-, root, root, 0755)
 %doc LICENSE README.md examples
 %{_bindir}/puppet
 %{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
+%dir %{_sysconfdir}/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
 %if 0%{?_with_systemd}
 %{_unitdir}/puppetagent.service
 %else
@@ -380,12 +391,18 @@ rm -rf %{buildroot}
 * <%= Time.now.strftime("%a %b %d %Y") %> Puppet Labs Release <info@puppetlabs.com> -  <%= @rpmversion %>-<%= @rpmrelease %>
 - Build for <%= @version %>
 
+* Fri Apr 12 2013 Matthaus Owens <matthaus@puppetlabs.com> - 3.2.0-0.1rc0
+- Add requires on ruby-rgen for new parser in Puppet 3.2
+
 * Fri Jan 25 2013 Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0-0.1rc1
 - Add extlookup2hiera.8.gz to the files list
 
 * Wed Jan 9  2013 Ryan Uber <ru@ryanuber.com> - 3.1.0-0.1rc1
 - Work-around for RH Bugzilla 681540
 
+* Fri Dec 28 2012 Michael Stahnke <stahnma@puppetlabs.com> -  3.0.2-2
+- Added a script for Network Manager for bug https://bugzilla.redhat.com/532085
+
 * Tue Dec 18 2012 Matthaus Owens <matthaus@puppetlabs.com>
 - Remove for loop on examples/ code which no longer exists. Add --no-run-if-empty to xargs invocations.
 

data/ext/suse/client.init

@@ -39,7 +39,7 @@ puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
 PUPPET_OPTS="agent"
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 

data/ext/systemd/puppetagent.service

@@ -5,9 +5,9 @@ After=basic.target network.target
 
 [Service]
 Type=forking
+EnvironmentFile=-/etc/sysconfig/puppetagent
 PIDFile=/run/puppet/agent.pid
-ExecStartPre=/usr/bin/install -d -o puppet -m 755 /run/puppet
-ExecStart=/usr/bin/puppet agent
+ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS
 
 [Install]
 WantedBy=multi-user.target

data/ext/systemd/puppetmaster.service

@@ -5,9 +5,9 @@ After=basic.target network.target
 
 [Service]
 Type=forking
+EnvironmentFile=-/etc/sysconfig/puppetmaster
 PIDFile=/run/puppet/master.pid
-ExecStartPre=/usr/bin/install -d -o puppet -m 755 /run/puppet
-ExecStart=/usr/bin/puppet master
+ExecStart=/usr/bin/puppet master $PUPPETMASTER_EXTRA_OPTS
 
 [Install]
 WantedBy=multi-user.target

data/lib/hiera/scope.rb

@@ -1,5 +1,9 @@
 class Hiera
   class Scope
+    CALLING_CLASS = "calling_class"
+    CALLING_MODULE = "calling_module"
+    MODULE_NAME = "module_name"
+
     attr_reader :real
 
     def initialize(real)
@@ -7,23 +11,27 @@ class Hiera
     end
 
     def [](key)
-      if key == "calling_class"
-        ans = @real.resource.name.to_s.downcase
-      elsif key == "calling_module"
-        ans = @real.resource.name.to_s.downcase.split("::").first
+      if key == CALLING_CLASS
+        ans = find_hostclass(@real)
+      elsif key == CALLING_MODULE
+        ans = @real.lookupvar(MODULE_NAME)
       else
         ans = @real.lookupvar(key)
       end
 
-      # damn you puppet visual basic style variables.
-      return nil if ans == ""
-      return ans
+      if ans.nil? or ans == ""
+        nil
+      else
+        ans
+      end
     end
 
     def include?(key)
-      return true if ["calling_class", "calling_module"].include?(key)
-
-      return @real.lookupvar(key) != ""
+      if key == CALLING_CLASS or key == CALLING_MODULE
+        true
+      else
+        @real.lookupvar(key) != ""
+      end
     end
 
     def catalog
@@ -37,6 +45,16 @@ class Hiera
     def compiler
       @real.compiler
     end
+
+    def find_hostclass(scope)
+      if scope.source and scope.source.type == :hostclass
+        return scope.source.name.downcase
+      elsif scope.parent
+        return find_hostclass(scope.parent)
+      else
+        return nil
+      end
+    end
+    private :find_hostclass
   end
 end
-

data/lib/hiera_puppet.rb

@@ -6,9 +6,7 @@ module HieraPuppet
   module_function
 
   def lookup(key, default, scope, override, resolution_type)
-    unless scope.respond_to?("[]")
-      scope = Hiera::Scope.new(scope)
-    end
+    scope = Hiera::Scope.new(scope)
 
     answer = hiera.lookup(key, default, scope, override, resolution_type)
 

data/lib/puppet/agent.rb

@@ -37,7 +37,7 @@ class Puppet::Agent
 
     result = nil
     block_run = Puppet::Application.controlled_run do
-      splay
+      splay client_options.fetch :splay, Puppet[:splay]
       result = run_in_fork(should_fork) do
         with_client do |client|
           begin
@@ -66,8 +66,8 @@ class Puppet::Agent
   end
 
   # Sleep when splay is enabled; else just return.
-  def splay
-    return unless Puppet[:splay]
+  def splay(do_splay = Puppet[:splay])
+    return unless do_splay
     return if splayed?
 
     time = rand(Puppet[:splaylimit] + 1)

data/lib/puppet/application.rb

@@ -376,8 +376,8 @@ class Application
     setup_logs
   end
 
-  def setup_logs
-    if options[:debug] or options[:verbose]
+  def setup_logs(is_daemon = false)
+    if options[:debug] or options[:verbose] or is_daemon
       Puppet::Util::Log.newdestination(:console)
       if options[:debug]
         Puppet::Util::Log.level = :debug

data/lib/puppet/application/agent.rb

@@ -166,16 +166,16 @@ when signing certificates).
 
 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.
+
+Note that any Puppet setting that's valid in the configuration file is also a
+valid long argument. For example, 'server' is a valid setting, so you can
+specify '--server <servername>' as an argument. Boolean settings translate into
+'--setting' and '--no-setting' pairs.
 
 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 agent with
-'--genconfig'.
+full list of acceptable settings. A commented list of all settings can also be
+generated by running puppet agent with '--genconfig'.
 
 * --certname:
   Set the certname (unique ID) of the client. The master reads this
@@ -183,12 +183,17 @@ configuration options can also be generated by running puppet agent with
   fully-qualified domain name, to determine which configurations the
   node will receive. Use this option to debug setup problems or
   implement unusual node identification schemes.
+  (This is a Puppet setting, and can go in puppet.conf.)
 
 * --daemonize:
   Send the process into the background. This is the default.
+  (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+  prefix for boolean settings on the command line.)
 
 * --no-daemonize:
   Do not send the process into the background.
+  (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+  prefix for boolean settings on the command line.)
 
 * --debug:
   Enable full debugging.
@@ -240,26 +245,34 @@ configuration options can also be generated by running puppet agent with
   file. Defaults to sending messages to syslog, or the console if
   debugging or verbosity is enabled.
 
+* --masterport:
+  The port on which to contact the puppet master.
+  (This is a Puppet setting, and can go in puppet.conf.)
+
 * --no-client:
-  Do not create a config client. This will cause the daemon to start 
-  but not check configuration unless it is triggered with `puppet 
-  kick`. This only makes sense when puppet agent is being run with 
+  Do not create a config client. This will cause the daemon to start
+  but not check configuration unless it is triggered with `puppet
+  kick`. This only makes sense when puppet agent is being run with
   listen = true in puppet.conf or was started with the `--listen` option.
 
 * --noop:
   Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
   is useful for seeing what changes Puppet will make without actually
   executing the changes.
+  (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+  prefix for boolean settings on the command line.)
 
 * --onetime:
   Run the configuration once. Runs a single (normally daemonized) Puppet
   run. Useful for interactively running puppet agent when used in
   conjunction with the --no-daemonize option.
+  (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+  prefix for boolean settings on the command line.)
 
 * --test:
   Enable the most common options used for testing. These are 'onetime',
   'verbose', 'ignorecache', 'no-daemonize', 'no-usecacheonfailure',
-  'detailed-exit-codes', 'no-splay', and 'show_diff'.
+  'detailed-exitcodes', 'no-splay', and 'show_diff'.
 
 * --verbose:
   Turn on verbose reporting.
@@ -274,6 +287,8 @@ configuration options can also be generated by running puppet agent with
   it to sign a certificate request. This is useful for the initial setup
   of a puppet client. You can turn off waiting for certificates by
   specifying a time of 0.
+  (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
+  prefix for boolean settings on the command line.)
 
 
 EXAMPLE
@@ -430,7 +445,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def setup
     setup_test if options[:test]
 
-    setup_logs
+    setup_logs(true)
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?