knife-joyent 0.2.0 → 0.2.1

data/README.md

@@ -47,11 +47,13 @@ Currently available commands:
 The following command will provision an Ubuntu 12.04 with 1GB of memory and bootstrap it with chef
 
     knife joyent server create \
-        --flavor "Small 1GB"
+        --flavor "Small 1GB" \
         --image d2ba0f30-bbe8-11e2-a9a2-6bc116856d85 \
         --node-name 'chefbuntu-x' \
         --server-name 'chefbuntu-x'
 
+Please see ``knife joyent server create --help`` for more options
+
 ## Configuration
 
 The following options can be specified in your knife configuration file
@@ -105,6 +107,10 @@ by/from different sources / users.
  - [Eric Saxby](https://github.com/sax) - ModCloth
  - [Stephen Lauck](https://github.com/stephenlauck) - ModCloth
 
+## Chef for smartos
+
+To bootstrap chef on SmartOS, use this [bootstrap template](https://gist.github.com/stephenlauck/3836791)
+
 ## License
 
 Copyright 2012 Joyent, Inc

data/lib/chef/knife/joyent_server_create.rb

@@ -121,7 +121,6 @@ class Chef
             exit 1
           end
         end
-        puts ui.color("SSH Ready.", :cyan)
       end
 
 
@@ -151,6 +150,7 @@ class Chef
         end
 
         Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip}")
+        puts "\n"
         puts ui.color("Bootstrap IP Address #{bootstrap_ip}", :cyan)
         if Chef::Config[:knife][:provisioner]
           # tag the provision with 'provisioner'
@@ -182,20 +182,31 @@ class Chef
         puts ui.color("Waiting for SSH to come up on: #{bootstrap_ip}", :cyan)
         tcp_test_ssh(bootstrap_ip)
 
-        puts ui.color("Bootstrapping: #{bootstrap_ip}", :cyan)
+        # smartos zoneinit needs to take it's time
+        if server.type == 'smartmachine'
+          puts ui.color("Waiting for smartos to fully initialize...", :cyan)
+          sleep 25
+        end
+
         bootstrap_for_node(server, bootstrap_ip).run
 
       rescue Excon::Errors::Conflict => e
         if e.response && e.response.body.kind_of?(String)
           error = ::Fog::JSON.decode(e.response.body)
-          puts ui.error(error['message'])
+          print ui.error(error['message'])
+          if error.key?('errors') && error['errors'].kind_of?(Array)
+            error['errors'].each do |err|
+              print ui.error " * [#{err['field']}] #{err['message']}"
+            end
+          end
           exit 1
         else
           puts ui.error(e.message)
           exit 1
         end
+
       rescue => e
-        puts ui.error('Unexpected Error Occured:' + e.message)
+        puts ui.error('Unexpected Error Occured:' + e.inspect)
         exit 1
       end
 
@@ -276,23 +287,22 @@ class Chef
         tcp_socket = TCPSocket.new(hostname, 22)
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
-          puts ui.color("SSHD OK [#{hostname}] #{tcp_socket.gets}", :cyan)
-          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          banner = tcp_socket.gets
+          puts ui.color("SSHD accepting connections on #{hostname}: banner is #{banner}")
+          Chef::Log.debug("SSHD accepting connections on #{hostname}: banner is #{banner}")
           true
         else
           false
         end
-      rescue Errno::ETIMEDOUT
-        false
-      rescue Errno::EPERM
-        false
-      rescue Errno::ECONNREFUSED
-        false
-      rescue Errno::ECONNRESET
-        false
-      rescue Errno::ENETUNREACH
-        false
-      rescue Errno::EHOSTUNREACH
+      rescue SocketError,
+             IOError,
+             Errno::ETIMEDOUT,
+             Errno::EPERM,
+             Errno::ECONNREFUSED,
+             Errno::ECONNRESET,
+             Errno::ENETUNREACH,
+             Errno::EHOSTUNREACH
+        sleep 2
         false
       ensure
         tcp_socket && tcp_socket.close

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog