knife-joyent 0.2.1 → 0.2.2

data/README.md

@@ -107,9 +107,10 @@ by/from different sources / users.
  - [Eric Saxby](https://github.com/sax) - ModCloth
  - [Stephen Lauck](https://github.com/stephenlauck) - ModCloth
 
-## Chef for smartos
+## Bootstrap template for smartos
 
-To bootstrap chef on SmartOS, use this [bootstrap template](https://gist.github.com/stephenlauck/3836791)
+To bootstrap chef on SmartOS, use the script provided at the [Joyent Wiki] (http://wiki.joyent.com/wiki/display/jpc2/Joyent+ChefServer+SmartMachine#JoyentChefServerSmartMachine-BootstrappingaBareImagedSmartMachinetoyourChefServer)
+which sets up chef-client with SMF and installs the basic essentials.
 
 ## License
 

data/lib/chef/knife/joyent_server_create.rb

@@ -179,15 +179,12 @@ class Chef
         msg_pair("IP's", server.ips.join(" "))
         msg_pair("JSON Attributes",config[:json_attributes]) unless config[:json_attributes].empty?
 
+        puts ui.color("Waiting for server to fully initialize...", :cyan)
+        sleep 20
+
         puts ui.color("Waiting for SSH to come up on: #{bootstrap_ip}", :cyan)
         tcp_test_ssh(bootstrap_ip)
 
-        # 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

data/lib/knife-joyent/version.rb

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

metadata

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