diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/client.rb | 12 | ||||
| -rw-r--r-- | lib/chef/knife.rb | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index b2a00a7d01..6ac5cecbdf 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -550,14 +550,10 @@ class Chef # - ohai[:machinename] # - ohai[:hostname] # - # If we are running against a server with authentication protocol < 1.0, we - # *require* authentication protocol version 1.1. - # # @raise [Chef::Exceptions::CannotDetermineNodeName] If the node name is not # set and cannot be determined via ohai. # # @see Chef::Config#node_name - # @see Chef::Config#authentication_protocol_version # # @api private # @@ -567,14 +563,6 @@ class Chef raise Chef::Exceptions::CannotDetermineNodeName unless name - # node names > 90 bytes only work with authentication protocol >= 1.1 - # see discussion in config.rb. - # TODO use a computed default in Chef::Config to determine this instead of - # setting it. - if name.bytesize > 90 - Chef::Config[:authentication_protocol_version] = "1.1" - end - name end diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 5df24faa11..2820f58e85 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -385,12 +385,6 @@ class Chef Mixlib::Log::Formatter.show_time = false Chef::Log.init(Chef::Config[:log_location]) Chef::Log.level(Chef::Config[:log_level] || :error) - - if Chef::Config[:node_name] && Chef::Config[:node_name].bytesize > 90 - # node names > 90 bytes only work with authentication protocol >= 1.1 - # see discussion in config.rb. - Chef::Config[:authentication_protocol_version] = "1.1" - end end def configure_chef |