knife-joyent 0.1.4 → 0.2.0

data/README.md

@@ -42,6 +42,16 @@ Currently available commands:
     knife joyent tag delete <server_id> -A
     knife joyent tag list <server_id>
 
+## Example Usage
+
+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"
+        --image d2ba0f30-bbe8-11e2-a9a2-6bc116856d85 \
+        --node-name 'chefbuntu-x' \
+        --server-name 'chefbuntu-x'
+
 ## Configuration
 
 The following options can be specified in your knife configuration file

data/knife-joyent.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.add_dependency "fog", "~> 1.11"
+  s.add_dependency "multi_json", "~> 1.7"
   s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 

data/lib/chef/knife/joyent_server_create.rb

@@ -111,20 +111,17 @@ class Chef
       def tcp_test_ssh(hostname)
         ssh_test_max = 10*60
         ssh_test = 0
-
-        begin
+        until _tcp_test_ssh(hostname)
           if ssh_test < ssh_test_max
             print(".")
             ssh_test += 1
             sleep 1
           else
-            ui.error("Unable to ssh to node (#{bootstrap_ip_address}), exiting")
+            puts ui.error("Unable to ssh to node (#{bootstrap_ip_address}), exiting")
             exit 1
           end
-        end until _tcp_test_ssh(bootstrap_id) {
-          sleep @initial_sleep_delay ||= 10
-          puts("done")
-        }
+        end
+        puts ui.color("SSH Ready.", :cyan)
       end
 
 
@@ -143,19 +140,18 @@ class Chef
           :package => config[:package]
         }.merge(joyent_metadata))
 
-        print "\n#{ui.color("Waiting for server", :magenta)}"
+        puts ui.color("Waiting for Server to be Provisioned", :magenta)
         server.wait_for { print "."; ready? }
 
         bootstrap_ip = self.determine_bootstrap_ip(server)
 
-        Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip}")
         unless bootstrap_ip
-          ui.error("No IP address available for bootstrapping.")
+          puts ui.error("No IP address available for bootstrapping.")
           exit 1
         end
 
-        puts ui.color("attempting to bootstrap on #{bootstrap_ip}", :cyan)
-
+        Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip}")
+        puts ui.color("Bootstrap IP Address #{bootstrap_ip}", :cyan)
         if Chef::Config[:knife][:provisioner]
           # tag the provision with 'provisioner'
           tagkey = 'provisioner'
@@ -171,11 +167,9 @@ class Chef
           puts ui.color("Updated tags for #{node_name}", :cyan)
           puts ui.list(tags, :uneven_columns_across, 2)
         else
-          puts ui.color("No user defined in knife config for provision tagging", :magenta)
+          puts ui.color("No user defined in knife config for provision tagging -- continuing", :magenta)
         end
 
-        bootstrap_for_node(server, bootstrap_ip).run
-
         puts ui.color("Created machine:", :cyan)
         msg_pair("ID", server.id.to_s)
         msg_pair("Name", server.name)
@@ -185,6 +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 SSH to come up on: #{bootstrap_ip}", :cyan)
+        tcp_test_ssh(bootstrap_ip)
+
+        puts ui.color("Bootstrapping: #{bootstrap_ip}", :cyan)
+        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)
@@ -276,8 +276,8 @@ 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}")
-          yield
           true
         else
           false
@@ -287,10 +287,12 @@ class Chef
       rescue Errno::EPERM
         false
       rescue Errno::ECONNREFUSED
-        sleep 2
+        false
+      rescue Errno::ECONNRESET
+        false
+      rescue Errno::ENETUNREACH
         false
       rescue 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.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -106,4 +122,3 @@ signing_key:
 specification_version: 3
 summary: Joyent CloudAPI Support for Chef's Knife Command
 test_files: []
-has_rdoc: true