chef-metal-ssh 0.0.3 → 0.0.4

data/README.md

@@ -26,8 +26,8 @@ Or install it yourself as:
 		  provisioner ChefMetalSsh::SshProvisioner.new
 		  provisioner_options 'target_ip' => '192.168.33.21',
 		                      'ssh_user' => 'vagrant',
-		                      'ssh_connect_options' => {
-		                        'ssh_pass' => 'vagrant'
+		                      'ssh_options' => {
+		                        'password' => 'vagrant'
 		                      }
 		  recipe 'ssh_test::remote1'
 		  notifies :create, 'machine[two]'
@@ -60,7 +60,11 @@ cd into the test directory:
 
 then run:
 
-`bash run_zero install`
+`bash run_zero install_local` if you built the gem locally first using `rake build`
+
+otherwise:
+
+`bash run_zero install_rubygems`
 
 this will install the prereqs. then run:
 

data/lib/chef_metal_ssh/ssh_provisioner.rb

@@ -1,3 +1,4 @@
+require 'resolv'
 require 'chef_metal/provisioner'
 require 'chef_metal/version'
 require 'chef_metal/machine/basic_machine'
@@ -27,17 +28,17 @@ module ChefMetalSsh
     #        node will have node['normal']['provisioner_options'] in it with any options.
     #        It is a hash with this format:
     #
-    #           -- provisioner_url: ssh:<ssh_path>
+    #           -- provisioner_url: ssh:<@target_host>
     #           -- target_ip: the IP address of the target machine - IP or FQDN is required
     #           -- target_fqdn: The Resolvable name of the target machine - IP or FQDN is required
     #           -- ssh_user: the user to ssh as
-    #           -- ssh_config: options to pass the ssh command. available options are here - https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh.rb#L61
+    #           -- ssh_options: options to pass the ssh command. available options are here - https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh.rb#L61
     #
     #        node['normal']['provisioner_output'] will be populated with information
     #        about the created machine.  For ssh, it is a hash with this
     #        format:
     #
-    #           -- provisioner_url: ssh:<ssh_path>
+    #           -- provisioner_url: ssh:<@target_host>
     #           -- name: container name
     #
     def acquire_machine(action_handler, node)
@@ -59,7 +60,7 @@ module ChefMetalSsh
       # Set up Provisioner Output
       # TODO - make url the chef server url path? maybe disk path if zero?
       provisioner_output = node['normal']['provisioner_output'] || {
-        'provisioner_url' =>   "ssh:#{target_host}",
+        'provisioner_url' =>   "ssh:#{@target_host}",
         'name' => node['name']
       }
 
@@ -127,8 +128,28 @@ module ChefMetalSsh
       if @target_host
         remote_host = @target_host
       elsif target_ip
+        raise 'Invalid IP' unless ( target_ip =~ Resolv::IPv4::Regex ||
+                                    target_ip =~ Resolv::IPv6::Regex )
         remote_host = target_ip
       elsif target_fqdn
+        rh = Resolv::Hosts.new
+        rd = Resolv.new
+
+        begin
+          rh.getaddress(target_fqdn)
+          in_hosts_file = true
+        rescue
+          in_hosts_file = false
+        end
+
+        begin
+          rd.getaddress(target_fqdn)
+          in_dns = true
+        rescue
+          in_dns = false
+        end
+
+        raise 'Unresolvable Hostname' unless ( in_hosts_file || in_dns )
         remote_host = target_fqdn
       else
         raise "aint got no target yo, that dog dont hunt"
@@ -151,12 +172,26 @@ module ChefMetalSsh
       end
     end
 
+    def symbolize_keys(hash)
+      hash.inject({}){|result, (key, value)|
+        new_key = case key
+        when String then key.to_sym
+        else key
+        end
+        new_value = case value
+        when Hash then symbolize_keys(value)
+        else value
+        end
+        result[new_key] = new_value
+        result
+      }
+    end
+
     # Setup Ssh
     def create_ssh_transport(node)
-      # TODO - verify target_host resolves
-      # Verify Valid IP
 
-      provisioner_options = node['normal']['provisioner_options']
+      provisioner_options     = node['normal']['provisioner_options']
+      provisioner_ssh_options = provisioner_options['ssh_options']
 
       Chef::Log.debug("======================================>")
       Chef::Log.debug("create_ssh_transport - target_host: #{@target_host}")
@@ -164,8 +199,8 @@ module ChefMetalSsh
 
       ##
       # Ssh Username
-      username    = ''
-      username    = provisioner_options['ssh_user'] || 'vagrant'
+      username = ''
+      username = provisioner_options['ssh_user'] || 'vagrant'
 
       Chef::Log.debug("======================================>")
       Chef::Log.debug("create_ssh_transport - username: #{username}")
@@ -173,29 +208,76 @@ module ChefMetalSsh
 
       ##
       # Ssh Password
-      ssh_pass = ''
-      ssh_pass = provisioner_options['ssh_connect_options']['ssh_pass']
+      ssh_pass = false
+      ssh_pass = provisioner_ssh_options['password'] if provisioner_ssh_options['password']
+      # ssh_pass = ssh_options[:password] if ssh_options[:password]
+
+      ##
+      # Ssh Key
+      ssh_key = false
+      ssh_key = provisioner_ssh_options['host_key'] if provisioner_ssh_options['host_key']
 
       Chef::Log.debug("======================================>")
-      Chef::Log.debug("create_ssh_transport - ssh_pass: #{ssh_pass}")
+      if ssh_pass
+        Chef::Log.debug("create_ssh_transport - ssh_pass: #{ssh_pass}")
+      elsif ssh_key
+        Chef::Log.debug("create_ssh_transport - ssh_key: #{ssh_key}")
+      else
+        Chef::Log.debug("create_ssh_transport - no ssh_pass or ssh_key given")
+      end
       Chef::Log.debug("======================================>")
 
+      raise "no ssh_pass or ssh_key given" unless ( ssh_pass || ssh_key )
       ##
       # Ssh Main Options
-      ssh_options = {}
-      ssh_options = {
-        # TODO create a user known hosts file
-        #          :user_known_hosts_file => provisioner_options['ssh_connect_options']['UserKnownHostsFile'],
-        #          :paranoid => true,
-        # :auth_methods => [ 'publickey' ],
-        :keys_only => false,
-        :password => ssh_pass
-      }
+      valid_ssh_options = [
+        :auth_methods, :bind_address, :compression, :compression_level, :config,
+        :encryption, :forward_agent, :hmac, :host_key,
+        :keepalive, :keepalive_interval, :kex, :keys, :key_data,
+        :languages, :logger, :paranoid, :password, :port, :proxy,
+        :rekey_blocks_limit,:rekey_limit, :rekey_packet_limit, :timeout, :verbose,
+        :global_known_hosts_file, :user_known_hosts_file, :host_key_alias,
+        :host_name, :user, :properties, :passphrase, :keys_only, :max_pkt_size,
+        :max_win_size, :send_env, :use_agent
+      ]
+
+      ##
+      # Ssh Main Options
+      ssh_options = symbolize_keys(provisioner_ssh_options)
+
+      # Validate Ssh Options
+      ssh_options.each { |k,v| raise 'Invalid Shh Option' unless valid_ssh_options.include?(k) }
+
+      ##
+      # Ssh Main Options
+      # ssh_options = symbolize_keys(provisioner_ssh_options)
+      # ssh_options = {
+      #   # TODO create a user known hosts file
+      #   #          :user_known_hosts_file => provisioner_options['ssh_connect_options']['UserKnownHostsFile'],
+      #   #          :paranoid => true,
+      #   # :auth_methods => [ 'publickey' ],
+      #   :keys_only => false,
+      #   :host_key => ssh_key,
+      #   :password => ssh_pass
+      # }
 
       Chef::Log.debug("======================================>")
       Chef::Log.debug("create_ssh_transport - ssh_options: #{ssh_options.inspect}")
       Chef::Log.debug("======================================>")
 
+      # Make Sure We Can Connect
+      begin
+        ssh = Net::SSH.start(@target_host, username, ssh_options)
+        ssh.close
+        Chef::Log.debug("======================================>")
+        Chef::Log.debug("ABLE to Connect to #{@target_host} using #{username} and #{ssh_options.inspect}")
+        Chef::Log.debug("======================================>")
+      rescue
+        Chef::Log.debug("======================================>")
+        Chef::Log.debug("UNABLE to Connect to #{@target_host} using #{username} and #{ssh_options.inspect}")
+        Chef::Log.debug("======================================>")
+        raise "UNABLE to Connect to #{@target_host} using #{username} and #{ssh_options.inspect}"
+      end
 
       ##
       # Ssh Additional Options

data/lib/chef_metal_ssh/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalSsh
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13107560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13107560
 - !ruby/object:Gem::Dependency
   name: chef-metal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13163400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+  version_requirements: *13163400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13161940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
+  version_requirements: *13161940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13160480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13160480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &13158020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *13158020
 description: Provisioner for managing servers using ssh in Chef Metal.
 email: zackzondlo@gmail.com
 executables: []
@@ -102,8 +77,8 @@ files:
 - Rakefile
 - LICENSE.txt
 - README.md
-- lib/chef_metal_ssh.rb
 - lib/chef_metal/provisioner_init/ssh_init.rb
+- lib/chef_metal_ssh.rb
 - lib/chef_metal_ssh/ssh_provisioner.rb
 - lib/chef_metal_ssh/version.rb
 homepage: https://github.com/double-z/chef-metal-ssh
@@ -126,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Provisioner for managing servers using ssh in Chef Metal.