diff options
| author | Luke Kanies <luke@madstop.com> | 2008-09-23 22:31:55 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-09-23 22:31:55 -0500 |
| commit | 4aeabbbb2163684ff7064198c653cd60d46e5717 (patch) | |
| tree | 7c3593bde6b7f28f3e20444a576eb37338cced14 /bin | |
| parent | 5b9dd01326a61b9ae89ae978e29a8170f76deb5e (diff) | |
| parent | 8d5ded09b9c9c944695c015e6e95b10ccebd6fb5 (diff) | |
Merge branch '0.24.x'
Conflicts:
lib/puppet/metatype/container.rb
lib/puppet/metatype/instances.rb
lib/puppet/metatype/metaparams.rb
lib/puppet/metatype/relationships.rb
lib/puppet/metatype/schedules.rb
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppetrun | 2 |
1 files changed, 1 insertions, 1 deletions
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(", ") |