knife-joyent 0.0.5 → 0.0.7

data/knife-joyent.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 require 'knife-joyent/version'
 
 Gem::Specification.new do |s|

data/lib/chef/knife/base.rb

@@ -34,11 +34,11 @@ module KnifeJoyent
           :description => 'path to ssh private key for signature auth',
           :proc => Proc.new {|key| Chef::Config[:knife][:joyent_keyfile] = key }
 
-        option :joyent_url,
+        option :joyent_api_url,
           :short => "-L JOYENT_API_URL",
           :long => "--joyent-api-url JOYENT_API_URL",
           :description => "Joyent API URL",
-          :proc => Proc.new {|key| Chef::Config[:knife][:joyent_url] = key }
+          :proc => Proc.new {|key| Chef::Config[:knife][:joyent_api_url] = key }
       end
 
       def connection
@@ -49,7 +49,7 @@ module KnifeJoyent
                             :joyent_password => Chef::Config[:knife][:joyent_password],
                             :joyent_keyname => Chef::Config[:knife][:joyent_keyname],
                             :joyent_keyfile => Chef::Config[:knife][:joyent_keyfile],
-                            :joyent_url => Chef::Config[:knife][:joyent_url]
+                            :joyent_url => Chef::Config[:knife][:joyent_api_url]
                           )
                         end
       end

data/lib/chef/knife/joyent_server_create.rb

@@ -3,35 +3,160 @@ module KnifeJoyent
 
     include KnifeJoyent::Base
 
+    deps do
+      require 'chef/knife/bootstrap'
+      Chef::Knife::Bootstrap.load_deps
+      require 'fog'
+      require 'socket'
+      require 'net/ssh/multi'
+      require 'readline'
+      require 'chef/json_compat'
+    end
+    
     banner 'knife joyent server create (options)'
 
+    # mixlib option parsing
     option :name,
       :long => '--name <name>',
       :description => 'name for this machine'
 
     option :package,
-      :long => '--flavor <name>',
+      :short => '-f FLAVOR_NAME',
+      :long => '--flavor FLAVOR_NAME',
       :description => 'specify flavor/package for the server'
 
     option :dataset,
-      :short => '--image <id>',
+      :short => '-I IMAGE_ID',
+      :long => '--image IMAGE_ID',
       :description => 'specify image for the server'
 
+    option :run_list,
+      :short => "-r RUN_LIST",
+      :long => "--run-list RUN_LIST",
+      :description => "Comma separated list of roles/recipes to apply",
+      :proc => lambda { |o| o.split(/[\s,]+/) },
+      :default => []
+
+    option :ssh_user,
+      :short => "-x USERNAME",
+      :long => "--ssh-user USERNAME",
+      :description => "The ssh username",
+      :default => "root"
+
+    option :identity_file,
+      :short => "-i IDENTITY_FILE",
+      :long => "--identity-file IDENTITY_FILE",
+      :description => "The SSH identity file used for authentication"
+
+    option :chef_node_name,
+      :short => "-N NAME",
+      :long => "--node-name NAME",
+      :description => "The Chef node name for your new node"
+
+    option :prerelease,
+      :long => "--prerelease",
+      :description => "Install the pre-release chef gems"
+
+    option :distro,
+      :short => "-d DISTRO",
+      :long => "--distro DISTRO",
+      :description => "Bootstrap a distro using a template",
+      :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
+      :default => "chef-full"
+
+    option :environment,
+      :short => "-E Environment",
+      :long => "--environment ENVIRONMENT",
+      :description => "Assign an environment to Chef Node",
+      :proc => Proc.new { |e| Chef::Config[:environment][:distro] = e },
+      :default => "_default"
+
+    option :no_host_key_verify,
+      :long => "--no-host-key-verify",
+      :description => "Disable host key verification",
+      :boolean => true,
+      :default => false
+
+    # wait for ssh to come up
+    def tcp_test_ssh(hostname)
+      tcp_socket = TCPSocket.new(hostname, 22)
+      readable = IO.select([tcp_socket], nil, nil, 5)
+      if readable
+        Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+        yield
+        true
+      else
+        false
+      end
+    rescue Errno::ETIMEDOUT
+      false
+    rescue Errno::EPERM
+      false
+    rescue Errno::ECONNREFUSED
+      sleep 2
+      false
+    rescue Errno::EHOSTUNREACH
+      sleep 2
+      false
+    ensure
+      tcp_socket && tcp_socket.close
+    end
+
+
+    # Run Chef bootstrap script
+    def bootstrap_for_node(server)
+      bootstrap = Chef::Knife::Bootstrap.new
+      Chef::Log.debug("Bootstrap name_args = [ #{server.ips.last} ]")
+      bootstrap.name_args = [ server.ips.last ]
+      Chef::Log.debug("Bootstrap run_list = #{config[:run_list]}")
+      bootstrap.config[:run_list] = config[:run_list]
+      Chef::Log.debug("Bootstrap ssh_user = #{config[:ssh_user]}")
+      bootstrap.config[:ssh_user] = config[:ssh_user]
+      Chef::Log.debug("Bootstrap identity_file = #{config[:identity_file]}")
+      bootstrap.config[:identity_file] = config[:identity_file]
+      Chef::Log.debug("Bootstrap chef_node_name = #{config[:chef_node_name]}")
+      bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
+      Chef::Log.debug("Bootstrap prerelease = #{config[:prerelease]}")
+      bootstrap.config[:prerelease] = config[:prerelease]
+      Chef::Log.debug("Bootstrap distro = #{config[:distro]}")
+      bootstrap.config[:distro] = config[:distro]
+      #Chef::Log.debug("Bootstrap use_sudo = #{config[:use_sudo]}")
+      #bootstrap.config[:use_sudo] = true
+      Chef::Log.debug("Bootstrap environment = #{config[:environment]}")
+      bootstrap.config[:environment] = config[:environment]
+      Chef::Log.debug("Bootstrap no_host_key_verify = #{config[:no_host_key_verify]}")
+      bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+
+      bootstrap
+    end
+
+    # Go
     def run
-      if s = self.connection.servers.create(:dataset => config[:dataset],
+      begin
+        server = self.connection.servers.create(:dataset => config[:dataset],
                                             :package => config[:package],
                                             :name => config[:name])
-        puts ui.color("Created machine: #{s.id}", :cyan)
-        exit 0
-      end
-    rescue => e
-      if e.response && e.response.body.kind_of?(String)
-        error = MultiJson.decode(e.response.body)
-        puts ui.error(error['message'])
-        exit 1
-      else
-        raise
+
+      rescue => e
+        Chef::Log.debug("e: #{e}")
+        if e.response && e.response.body.kind_of?(String)
+          error = MultiJson.decode(e.response.body)
+          puts ui.error(error['message'])
+          exit 1
+        else
+          raise
+        end
       end
+
+      puts ui.color("Created machine: #{server.id}", :cyan)
+      puts ui.color("attempting to bootstrap on #{server.ips.last}", :cyan)
+    
+      print(".") until tcp_test_ssh(server.ips.last) {
+        sleep 1
+        puts("done")
+      }
+      bootstrap_for_node(server).run
+      exit 0
     end
 
   end

data/lib/chef/knife/joyent_server_list.rb

@@ -20,7 +20,9 @@ module KnifeJoyent
         ui.color('Disk', :bold),
       ]
 
-      self.connection.servers.sort_by(&:name).each do |s|
+      self.connection.servers.sort do |a, b|
+        (a.name || '') <=> (b.name || '')
+      end.each do |s|
         servers << s.id.to_s
         servers << s.name
 

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,63 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-joyent
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: chef
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Joyent CloudAPI Support for Chef's Knife Command
-email: 
+email:
 - kevin@joyent.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -86,36 +80,26 @@ files:
 - lib/knife-joyent/version.rb
 homepage: https://github.com/kevinykchan/knife-joyent
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Joyent CloudAPI Support for Chef's Knife Command
 test_files: []
-