diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2009-07-29 21:58:02 +0200 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-07-30 07:49:11 +1000 |
| commit | fb60f90d13f1d1dc1ccc884030230764be642d09 (patch) | |
| tree | b597de51fc136c8aa30d26db57a868121430e623 | |
| parent | 0ca9b5322117879cf930c88a0473558d9e437ece (diff) | |
| download | puppet-fb60f90d13f1d1dc1ccc884030230764be642d09.tar.gz puppet-fb60f90d13f1d1dc1ccc884030230764be642d09.tar.xz puppet-fb60f90d13f1d1dc1ccc884030230764be642d09.zip | |
Fix #2465 - Default auth information is confusing with no auth.conf
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
| -rw-r--r-- | lib/puppet/network/rest_authconfig.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/rest_authconfig.rb b/lib/puppet/network/rest_authconfig.rb index 9a8c34935..635ed1b8d 100644 --- a/lib/puppet/network/rest_authconfig.rb +++ b/lib/puppet/network/rest_authconfig.rb @@ -58,7 +58,7 @@ module Puppet def insert_default_acl DEFAULT_ACL.each do |acl| unless rights[acl[:acl]] - Puppet.info "Inserting default '#{acl[:acl]}'(%s) acl because none were found in '%s'" % [acl[:authenticated] ? "auth" : "non-auth" , ( !exists? ? "no auth.conf file configured" : @file)] + Puppet.info "Inserting default '#{acl[:acl]}'(%s) acl because %s" % [acl[:authenticated] ? "auth" : "non-auth" , ( !exists? ? "#{Puppet[:rest_authconfig]} doesn't exist" : "none where found in '#{@file}'")] mk_acl(acl) end end |