knife-setup 1.0.8 → 1.0.9

data/lib/chef/knife/knife-setup.rb

@@ -187,14 +187,7 @@ class Chef
         bootstrap_client unless config[:nobootstrap]
         set_run_list(get_node, config[:run_list]) unless config[:run_list].empty?
         set_env(get_node, config[:environment]) unless config[:environment] == "_default"
-        
-        begin
-          knife_ssh("chef-client").run 
-        rescue Net::SSH::AuthenticationFailed
-          puts "Failed to authenticate #{config[:ssh_user]} - trying password auth"
-          knife_ssh_with_password_auth("chef-client").run 
-        end if config[:norunchef]
-
+        knife_ssh("chef-client").run if config[:norunchef]
         post if Chef::Config[:post_url]
       end
 
@@ -206,7 +199,7 @@ class Chef
       end
 
       def server_name
-        if config[:chef_node_name].nil?
+        if config[:chef_node_name].empty?
           Array(@name_args).first
         else
           config[:chef_node_name]
@@ -261,4 +254,4 @@ class Chef
 
     end
   end
-end
+end

data/lib/knife-setup/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Setup
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-setup
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef