summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Shafer <andrew@reductivelabs.com>2008-09-18 18:48:12 -0600
committerJames Turnbull <james@lovedthanlost.net>2008-09-19 12:30:40 +1000
commit11b0848b8c6eaaded608f4a485990ddb5bbd5e80 (patch)
tree7cc86a14e66c1511185a86fa8ffcce7fb952c787
parent3b1d6e25b4c1178554fb6df128e1cdf6dd9ef3b6 (diff)
downloadpuppet-11b0848b8c6eaaded608f4a485990ddb5bbd5e80.tar.gz
puppet-11b0848b8c6eaaded608f4a485990ddb5bbd5e80.tar.xz
puppet-11b0848b8c6eaaded608f4a485990ddb5bbd5e80.zip
Fixed #1500 - puppetrun host regression
-rw-r--r--CHANGELOG2
-rwxr-xr-xbin/puppetrun2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b2858a939..61e46915a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.24.x
+ Fixed #1500 - puppetrun not working
+
Fixed #1579 and #1580 - errors in the Puppet RPM spec file
Fixed #1572 -- file purging now fails if remote sources do not exist.
diff --git a/bin/puppetrun b/bin/puppetrun
index f33c7f8a1..28f72d9c3 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -245,7 +245,7 @@ end
# Now parse the config
Puppet.parse_config
-if Puppet[:node_terminus] = "ldap"
+if Puppet[:node_terminus] == "ldap" and (options[:all] or classes)
if options[:all]
hosts = Puppet::Node.search("whatever").collect { |node| node.name }
puts "all: %s" % hosts.join(", ")