diff options
Diffstat (limited to 'lib/puppet/indirector/node')
| -rw-r--r-- | lib/puppet/indirector/node/exec.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/indirector/node/ldap.rb | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/puppet/indirector/node/exec.rb b/lib/puppet/indirector/node/exec.rb index 445059d14..cac515f59 100644 --- a/lib/puppet/indirector/node/exec.rb +++ b/lib/puppet/indirector/node/exec.rb @@ -8,9 +8,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec def command command = Puppet[:external_nodes] - unless command != "none" - raise ArgumentError, "You must set the 'external_nodes' parameter to use the external node terminus" - end + raise ArgumentError, "You must set the 'external_nodes' parameter to use the external node terminus" unless command != "none" command.split end diff --git a/lib/puppet/indirector/node/ldap.rb b/lib/puppet/indirector/node/ldap.rb index 4cbc97573..71bca586d 100644 --- a/lib/puppet/indirector/node/ldap.rb +++ b/lib/puppet/indirector/node/ldap.rb @@ -49,9 +49,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap # Look for our node in ldap. def find(request) names = [request.key] - if request.key.include?(".") # we assume it's an fqdn - names << request.key.sub(/\..+/, '') - end + names << request.key.sub(/\..+/, '') if request.key.include?(".") # we assume it's an fqdn names << "default" node = nil @@ -248,9 +246,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap # Preload the parent array with the node name. parents = [info[:name]] while parent - if parents.include?(parent) - raise ArgumentError, "Found loop in LDAP node parents; #{parent} appears twice" - end + raise ArgumentError, "Found loop in LDAP node parents; #{parent} appears twice" if parents.include?(parent) parents << parent parent = find_and_merge_parent(parent, info) end |