chef-metal-fog 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ea9c6ac23831a0ea9f07511d18e154f131a69f
-  data.tar.gz: 445242bbb2c4291741ccac066de423a61c56533a
+  metadata.gz: f700b696e9287fbc6a14e028b27879efb1841828
+  data.tar.gz: eded4c9ec79313327158939eeeff70d09ef73e1b
 SHA512:
-  metadata.gz: 5118d0d757dbbaf5bd07f8920b6bb4d8e269d5c571a32591611329a0bbdf226bc775cd75df83987502431073947b5d922431950b7f45040655f279cdbfea68a7
-  data.tar.gz: a7462b748510bbd741320c72980d3e07541023b1182e1831562dfb023cd3d2c1e98804cd1a89d14cb0a6787a9b7100240707d9ff1f05fb1b41e0aa909a87e369
+  metadata.gz: 043b903bcc06d9337d2fc0910007e43a480d6ab7b70f2eb03f98a08f8825cc57235d937b8ecde0a0d48cc4cced0157b94d8f4858eb976b6286ee1e642baca204
+  data.tar.gz: d0f843d5bcdeeec31bc9beeb7ff033ac3befca843ba395a6a82423af7013f0dc7c01b0ecf0e4822542d0772dff294065259541b11f5526fc756dd4dedb1e9369

data/lib/chef_metal_fog/fog_driver.rb

@@ -418,7 +418,7 @@ module ChefMetalFog
 
     def bootstrap_options_for(action_handler, machine_spec, machine_options)
       bootstrap_options = symbolize_keys(machine_options[:bootstrap_options] || {})
-      if !bootstrap_options[:key_name]
+      if (provider == 'DigitalOcean' || provider == 'AWS') && !bootstrap_options[:key_name]
         bootstrap_options[:key_name] = overwrite_default_key_willy_nilly(action_handler)
       end
       tags = {
@@ -445,7 +445,11 @@ module ChefMetalFog
           bootstrap_options[:region_name] ||= 'San Francisco 1'
           bootstrap_options[:region_id] = compute.regions.select { |region| region.name == bootstrap_options[:region_name] }.first.id
         end
-        bootstrap_options[:ssh_key_ids] ||= [ compute.ssh_keys.select { |k| k.name == bootstrap_options[:key_name] }.first.id ]
+        found_key = compute.ssh_keys.select { |k| k.name == bootstrap_options[:key_name] }.first
+        if !found_key
+          raise "Could not find key named '#{bootstrap_options[:key_name]}' on #{driver_url}"
+        end
+        bootstrap_options[:ssh_key_ids] ||= [ found_key.id ]
 
         # You don't get to specify name yourself
         bootstrap_options[:name] = machine_spec.name
@@ -484,7 +488,7 @@ module ChefMetalFog
       end
     end
 
-    def ssh_options_for(machine_spec, server)
+    def ssh_options_for(machine_spec, machine_options, server)
       result = {
 # TODO create a user known hosts file
 #          :user_known_hosts_file => vagrant_ssh_config['UserKnownHostsFile'],
@@ -492,13 +496,15 @@ module ChefMetalFog
         :auth_methods => [ 'publickey' ],
         :keys_only => true,
         :host_key_alias => "#{server.id}.#{provider}"
-      }
+      }.merge(machine_options[:ssh_options] || {})
       if server.respond_to?(:private_key) && server.private_key
         result[:key_data] = [ server.private_key ]
       elsif server.respond_to?(:key_name)
         result[:key_data] = [ get_private_key(server.key_name) ]
       elsif machine_spec.location['key_name']
         result[:key_data] = [ get_private_key(machine_spec.location['key_name']) ]
+      elsif machine_options[:bootstrap_options][:key_name]
+        result[:key_data] = [ get_private_key(machine_options[:bootstrap_options][:key_name]) ]
       else
         # TODO make a way to suggest other keys to try ...
         raise "No key found to connect to #{machine_spec.name}!"
@@ -507,7 +513,7 @@ module ChefMetalFog
     end
 
     def create_ssh_transport(machine_spec, machine_options, server)
-      ssh_options = ssh_options_for(machine_spec, server)
+      ssh_options = ssh_options_for(machine_spec, machine_options, server)
       # If we're on AWS, the default is to use ubuntu, not root
       if provider == 'AWS'
         username = machine_spec.location['ssh_username'] || 'ubuntu'
@@ -547,7 +553,11 @@ module ChefMetalFog
       new_compute_options = {}
       new_compute_options[:provider] = provider
       new_config = { :driver_options => { :compute_options => new_compute_options }}
-      result = Cheffish::MergedConfig.new(new_config, config)
+      new_defaults = {
+                       :driver_options => { :compute_options => {} },
+                       :machine_options => { :bootstrap_options => {} }
+                     }
+      result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
 
       # Get data from the identifier in the URL
       if id && id != ''
@@ -593,8 +603,7 @@ module ChefMetalFog
         new_compute_options[:aws_access_key_id] = aws_profile[:aws_access_key_id]
         new_compute_options[:aws_secret_access_key] = aws_profile[:aws_secret_access_key]
         new_compute_options[:aws_session_token] = aws_profile[:aws_security_token]
-        # For :region, we prefer the region in compute options or URL over the region in the profile.
-        new_compute_options[:region] ||= aws_profile[:region] if aws_profile.has_key?(:region) && !compute_options.has_key?(:region)
+        new_defaults[:driver_options][:compute_options][:region] = aws_profile[:region]
       when 'OpenStack'
         # TODO it is supposed to be unnecessary to load credentials from fog this way;
         # why are we doing it?
@@ -614,6 +623,38 @@ module ChefMetalFog
         new_compute_options[:rackspace_region] ||= credential[:rackspace_region]
         new_compute_options[:rackspace_endpoint] ||= credential[:rackspace_endpoint]
         new_compute_options[:rackspace_compute_url] ||= credential[:rackspace_compute_url]
+      when 'DigitalOcean'
+        # This uses ~/.tugboat, generated by "tugboat authorize" - see https://github.com/pearkes/tugboat
+        tugboat_file = File.expand_path('~/.tugboat')
+        if File.exist?(tugboat_file)
+          tugboat_data = YAML.load(IO.read(tugboat_file))
+          new_compute_options.merge!(
+            :digitalocean_client_id => tugboat_data['authentication']['client_key'],
+            :digitalocean_api_key => tugboat_data['authentication']['api_key']
+          )
+          new_defaults[:machine_options].merge!(
+            #:ssh_username => tugboat_data['ssh']['ssh_user'],
+            :ssh_options => {
+              :port => tugboat_data['ssh']['ssh_port'],
+              # TODO we ignore ssh_key_path in favor of ssh_key / key_name stuff
+              #:key_data => [ IO.read(tugboat_data['ssh']['ssh_key_path']) ] # TODO use paths, not data?
+            }
+          )
+
+          # TODO verify that the key_name exists and matches the ssh key path
+
+          new_defaults[:machine_options][:bootstrap_options].merge!(
+            :region_id => tugboat_data['defaults']['region'].to_i,
+            :image_id => tugboat_data['defaults']['image'].to_i,
+            :size_id => tugboat_data['defaults']['region'].to_i,
+            :private_networking => tugboat_data['defaults']['private_networking'] == 'true',
+            :backups_enabled => tugboat_data['defaults']['backups_enabled'] == 'true',
+          )
+          ssh_key = tugboat_data['defaults']['ssh_key']
+          if ssh_key && ssh_key.size > 0
+            new_defaults[:machine_options][:bootstrap_options][:key_name] = ssh_key
+          end
+        end
       end
 
       id = case provider
@@ -622,11 +663,11 @@ module ChefMetalFog
           new_config[:driver_options][:aws_account_info] = account_info
           "#{account_info[:aws_account_id]}:#{result[:driver_options][:compute_options][:region]}"
         when 'DigitalOcean'
-          config[:driver_options][:compute_options][:digitalocean_client_id]
+          result[:driver_options][:compute_options][:digitalocean_client_id]
         when 'OpenStack'
-          config[:driver_options][:compute_options][:openstack_auth_url]
+          result[:driver_options][:compute_options][:openstack_auth_url]
         when 'Rackspace'
-          config[:driver_options][:compute_options][:rackspace_auth_url]
+          result[:driver_options][:compute_options][:rackspace_auth_url]
         when 'CloudStack'
           host   = result[:driver_options][:compute_options][:cloudstack_host]
           path   = result[:driver_options][:compute_options][:cloudstack_path]    || '/client/api'

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - John Keiser