puppetrun in puppet-0.23.0

- old
+ new

@@ -98,14 +98,17 @@
 # parallel::
 #   How parallel to make the connections.  Parallelization is provided by forking
 #   for each client to which to connect.  The default is 1, meaning serial execution.
 #
 # tag::
-#   Specify a tag for selecting the objects to apply.
+#   Specify a tag for selecting the objects to apply. Does not work with the
+#   --test option.
 #
+#
 # test::
-#   Print the hosts you would connect to but do not actually connect.
+#   Print the hosts you would connect to but do not actually connect. This
+#   option requires LDAP support at this point.
 #
 # = Example
 #
 #   sudo puppetrun -p 10 --host host1 --host host2 -t remotefile -t webserver
 #
@@ -270,10 +273,12 @@
     Puppet::Util::Log.level = :info
 end
 
 # Now parse the config
 config = File.join(Puppet[:confdir], "puppetmasterd.conf")
+Puppet.parse_config(config)
+
 if File.exists? config
     Puppet.config.parse(config)
 end
 
 if Puppet[:ldapnodes]
@@ -395,6 +400,6 @@
         end
     end
 end
 
 
-# $Id: puppetrun 2352 2007-03-24 22:07:19Z luke $
+# $Id: puppetrun 2464 2007-05-06 05:42:53Z luke $