Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	spec/unit/node/catalog.rb
	spec/unit/type/package.rb
	spec/unit/type/schedule.rb
	spec/unit/type/service.rb
	spec/unit/util/settings.rb

5 files changed, 18 insertions, 52 deletions

diff --git a/bin/puppet b/bin/puppet
index bb7308997..5e10ad460 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -141,8 +141,9 @@ if Puppet[:config] and File.exists? Puppet[:config]
     Puppet.settings.parse(Puppet[:config])
 end
 
-Puppet.genconfig
-Puppet.genmanifest
+if Puppet.settings.print_configs?
+    exit(Puppet.settings.print_configs ? 0 : 1)
+end
 
 # If noop is set, then also enable diffs
 if Puppet[:noop]
@@ -186,7 +187,7 @@ facts = Puppet::Node::Facts.find("me")
 facts.name = facts.values["hostname"]
 
 # Find our Node
-node = Puppet::Node.find_by_any_name(facts.name)
+node = Puppet::Node.find(facts.name)
 
 # Merge in the facts.
 node.merge(facts.values)
diff --git a/bin/puppetca b/bin/puppetca
index 75988432f..81e14396e 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -163,8 +163,9 @@ end
 # Now parse the config
 Puppet.parse_config
 
-Puppet.genconfig
-Puppet.genmanifest
+if Puppet.settings.print_configs?
+    exit(Puppet.settings.print_configs ? 0 : 1)
+end
 
 Puppet::Util::Log.newdestination :console
 
diff --git a/bin/puppetd b/bin/puppetd
index c36b3ed97..c38cebac0 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -299,8 +299,9 @@ unless options[:setdest]
     Puppet::Util::Log.newdestination(:syslog)
 end
 
-Puppet.genconfig
-Puppet.genmanifest
+if Puppet.settings.print_configs?
+    exit(Puppet.settings.print_configs ? 0 : 1)
+end
 
 # If noop is set, then also enable diffs
 if Puppet[:noop]
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 625b75d52..69d1049e2 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -151,8 +151,9 @@ unless options[:setdest]
     Puppet::Util::Log.newdestination(:syslog)
 end
 
-Puppet.genconfig
-Puppet.genmanifest
+if Puppet.settings.print_configs?
+    exit(Puppet.settings.print_configs ? 0 : 1)
+end
 
 # A temporary solution, to at least make the master work for now.
 Puppet::Node::Facts.terminus_class = :yaml
diff --git a/bin/puppetrun b/bin/puppetrun
index d0823b9c5..f1e30245b 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -139,51 +139,12 @@ begin
 rescue LoadError
     $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available"
 end
+
 require 'puppet'
 require 'puppet/network/client'
+require 'puppet/util/ldap/connection'
 require 'getoptlong'
 
-
-# Look up all nodes matching a given class in LDAP.
-def ldapnodes(klass, fqdn = true)
-    unless defined? @ldap
-        setupldap()
-    end
-
-    hosts = []
-
-    filter = nil
-    if klass == :all
-        filter = "objectclass=puppetclient"
-    else
-        filter = "puppetclass=#{klass}"
-    end
-    @ldap.search(Puppet[:ldapbase], 2, filter, "cn") do |entry|
-        # Skip the default host entry
-        if entry.dn =~ /cn=default,/
-            $stderr.puts "Skipping default host entry"
-            next
-        end
-
-        if fqdn
-            hosts << entry.dn.sub("cn=",'').sub(/ou=hosts,/i, '').gsub(",dc=",".")
-        else
-            hosts << entry.get_values("cn")[0]
-        end
-    end
-
-    return hosts
-end
-
-def setupldap
-    begin
-        @ldap = Puppet::Parser::Interpreter.ldap()
-    rescue => detail
-        $stderr.puts "Could not connect to LDAP: %s" % detail
-        exit(34)
-    end
-end
-
 flags = [
     [ "--all",      "-a",	        GetoptLong::NO_ARGUMENT ],
     [ "--tag",      "-t",           GetoptLong::REQUIRED_ARGUMENT ],
@@ -278,11 +239,12 @@ Puppet.parse_config
 
 if Puppet[:node_terminus] = "ldap"
     if options[:all]
-        hosts = ldapnodes(:all, options[:fqdn])
+        hosts = Puppet::Node.search("whatever").collect { |node| node.name }
         puts "all: %s" % hosts.join(", ")
     else
+        hosts = []
         classes.each do |klass|
-            list = ldapnodes(klass, options[:fqdn])
+            list = Puppet::Node.search("whatever", :class => klass).collect { |node| node.name }
             puts "%s: %s" % [klass, list.join(", ")]
 
             hosts += list