summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-05-19 17:58:47 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-05-19 17:58:47 +0000
commit0381cc1280c2c4c16687f7537962e9e1f1186d85 (patch)
tree37dc7a5c662390e0dbabc209e53dcb22c359c5b1 /bin
parentd55adda617793c90a0ad38b09ef620b14d2e497b (diff)
downloadpuppet-0381cc1280c2c4c16687f7537962e9e1f1186d85.tar.gz
puppet-0381cc1280c2c4c16687f7537962e9e1f1186d85.tar.xz
puppet-0381cc1280c2c4c16687f7537962e9e1f1186d85.zip
slight ldap fixes in puppetrun
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1215 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin')
-rwxr-xr-xbin/puppetrun5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/puppetrun b/bin/puppetrun
index 0b602201f..d2b3523f5 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -80,6 +80,7 @@
exit(1)
end
end
+require 'ldap'
require 'puppet'
require 'puppet/server'
require 'puppet/client'
@@ -210,7 +211,7 @@ if Puppet[:ldapnodes]
list = ldapnodes(klass)
puts "%s: %s" % [klass, list.join(", ")]
- hosts += []
+ hosts += list
end
elsif ! classes.empty?
$stderr.puts "You must be using LDAP to specify host classes"
@@ -260,6 +261,8 @@ while go
:Server => host,
:Port => Puppet[:puppetport]
)
+
+ puts "Triggering %s" % host
begin
client.run(tags, options[:ignoreschedules], options[:foreground])
rescue => detail