knife-joyent 0.1.3 → 0.1.4

data/README.md

@@ -66,10 +66,10 @@ or, your ssh key
 
 **joyent_api_url**
 
-Specify a custom API endpoint, this is required if you want to specify 
+Specify a custom API endpoint, this is required if you want to specify
 where you want to provision your machines, or if you are using knife with a
 provider powered by [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
-    
+
     # Defaults to https://us-west-1.api.joyentcloud.com/
     knife[:joyent_api_url] = "https://us-sw-1.api.joyentcloud.com/"
 
@@ -83,6 +83,12 @@ the form of a hash with a single level of nesting. See the
       "some_data" => "value"
     }
 
+**provisioner**
+
+Machines provisioned will be tagged with key ``provisioner`` containing the value specified.
+This is useful for tracking source of provisions for accounts where machines are provisioned
+by/from different sources / users.
+
 ## Contributors
 
  - [Sean Omera](https://github.com/someara) - Opscode

data/knife-joyent.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   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.6"
+  s.add_dependency "fog", "~> 1.11"
   s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 

data/lib/chef/knife/joyent_base.rb

@@ -21,7 +21,7 @@ class Chef
 
           option :joyent_password,
             :short => '-P PASSWORD',
-            :long => '--joyent-password PASSOWRD',
+            :long => '--joyent-password PASSWORD',
             :description => 'Your Joyent password',
             :proc => Proc.new {|key| Chef::Config[:knife][:joyent_password] = key }
 
@@ -45,7 +45,7 @@ class Chef
 
       def connection
         @connection ||= begin
-          connection = Fog::Compute.new(
+           Fog::Compute.new(
             :provider => 'Joyent',
             :joyent_username => Chef::Config[:knife][:joyent_username],
             :joyent_password => Chef::Config[:knife][:joyent_password],

data/lib/chef/knife/joyent_server_create.rb

@@ -108,31 +108,26 @@ class Chef
         return (block_a.include?(ip) or block_b.include?(ip) or block_c.include?(ip))
       end
 
-      # 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
+        ssh_test_max = 10*60
+        ssh_test = 0
+
+        begin
+          if ssh_test < ssh_test_max
+            print(".")
+            ssh_test += 1
+            sleep 1
+          else
+            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
 
+
       def run
         $stdout.sync = true
 
@@ -151,45 +146,35 @@ class Chef
         print "\n#{ui.color("Waiting for server", :magenta)}"
         server.wait_for { print "."; ready? }
 
-        #which IP address to bootstrap
-        bootstrap_ip_addresses = server.ips.select{ |ip| ip and not(is_loopback(ip) or is_linklocal(ip)) }
+        bootstrap_ip = self.determine_bootstrap_ip(server)
 
-        if bootstrap_ip_addresses.count == 1
-          bootstrap_ip_address = bootstrap_ip_addresses.first
-        else
-          if config[:private_network]
-            bootstrap_ip_address = bootstrap_ip_addresses.find{|ip| is_private(ip)}
-          else
-            bootstrap_ip_address = bootstrap_ip_addresses.find{|ip| not is_private(ip)}
-          end
-        end
-
-        Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip_address}")
-        if bootstrap_ip_address.nil?
+        Chef::Log.debug("Bootstrap IP Address #{bootstrap_ip}")
+        unless bootstrap_ip
           ui.error("No IP address available for bootstrapping.")
           exit 1
         end
 
-        puts ui.color("attempting to bootstrap on #{bootstrap_ip_address}", :cyan)
-
-        ssh_test_max = 10*60
-        ssh_test = 0
-
-        begin
-          if ssh_test < ssh_test_max
-            print(".")
-            ssh_test += 1
-            sleep 1
-          else
-            ui.error("Unable to ssh to node (#{bootstrap_ip_address}), exiting")
-            exit 1
+        puts ui.color("attempting to bootstrap on #{bootstrap_ip}", :cyan)
+
+        if Chef::Config[:knife][:provisioner]
+          # tag the provision with 'provisioner'
+          tagkey = 'provisioner'
+          tagvalue = Chef::Config[:knife][:provisioner]
+          tags = [
+            ui.color('Name', :bold),
+            ui.color('Value', :bold),
+          ]
+          server.add_tags({tagkey => tagvalue}).each do |k, v|
+            tags << k
+            tags << v
           end
-        end until tcp_test_ssh(bootstrap_ip_address) {
-          sleep @initial_sleep_delay ||= 10
-          puts("done")
-        }
+          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)
+        end
 
-        bootstrap_for_node(server, bootstrap_ip_address).run
+        bootstrap_for_node(server, bootstrap_ip).run
 
         puts ui.color("Created machine:", :cyan)
         msg_pair("ID", server.id.to_s)
@@ -197,39 +182,77 @@ class Chef
         msg_pair("State", server.state)
         msg_pair("Type", server.type)
         msg_pair("Dataset", server.dataset)
-        msg_pair("IP's", server.ips)
+        msg_pair("IP's", server.ips.join(" "))
         msg_pair("JSON Attributes",config[:json_attributes]) unless config[:json_attributes].empty?
+
+      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'])
+          exit 1
+        else
+          puts ui.error(e.message)
+          exit 1
+        end
+      rescue => e
+        puts ui.error('Unexpected Error Occured:' + e.message)
+        exit 1
       end
 
       # Run Chef bootstrap script
-      def bootstrap_for_node(server, bootstrap_ip_address)
+      def bootstrap_for_node(server, bootstrap_ip)
         bootstrap = Chef::Knife::Bootstrap.new
-        Chef::Log.debug("Bootstrap name_args = [ #{bootstrap_ip_address} ]")
-        bootstrap.name_args = [ bootstrap_ip_address ]
+        Chef::Log.debug("Bootstrap name_args = [ #{bootstrap_ip} ]")
+        bootstrap.name_args = [ bootstrap_ip ]
+
         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]
+
         Chef::Log.debug("Bootstrap json_attributes = #{config[:json_attributes]}")
         bootstrap.config[:first_boot_attributes] = config[:json_attributes]
 
         bootstrap
       end
 
+      def determine_bootstrap_ip(server)
+        server_ips = server.ips.select{ |ip|
+          ip and not(is_loopback(ip) or is_linklocal(ip))
+        }
+        if server_ips.count === 1
+          server_ips.first
+        else
+          if config[:private_network]
+            server_ips.find{|ip| is_private(ip)}
+          else
+            server_ips.find{|ip| not is_private(ip)}
+          end
+        end
+      end
+
       private
 
       def validate_server_name
@@ -248,6 +271,31 @@ class Chef
         return {} if metadata.empty?
         Hash[metadata.map { |k, v| ["metadata.#{k}", v] }]
       end
+
+      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
+
     end
   end
 end

data/lib/chef/knife/joyent_server_delete.rb

@@ -25,7 +25,7 @@ class Chef
         msg("State", server.state)
         msg("Type", server.type)
         msg("Dataset", server.dataset)
-        msg("IP's", server.ips)
+        msg("IP's", server.ips.join(" "))
        
         unless server
           puts ui.error("Unable to locate server: #{id}")

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Joyent CloudAPI Support for Chef's Knife Command
 test_files: []
+has_rdoc: true