digitalocean.rb in chef-provisioning-fog-0.16.0

- old
+ new

@@ -14,27 +14,27 @@
         # DigitalOcean does not have floating IPs
       end
 
       def bootstrap_options_for(action_handler, machine_spec, machine_options)
         bootstrap_options = symbolize_keys(machine_options[:bootstrap_options] || {})
-        if bootstrap_options[:key_path]
+        if bootstrap_options[:key_path] || bootstrap_options[:key_name]
           bootstrap_options[:key_name] ||= File.basename(bootstrap_options[:key_path])
           # Verify that the provided key name and path are in line (or create the key pair if not!)
           driver = self
           Provisioning.inline_resource(action_handler) do
             fog_key_pair bootstrap_options[:key_name] do
               private_key_path bootstrap_options[:key_path]
               driver driver
             end
           end
         else
-          bootstrap_options[:key_name] = overwrite_default_key_willy_nilly(action_handler, machine_spec)
+          bootstrap_options[:key_name] ||= overwrite_default_key_willy_nilly(action_handler, machine_spec)
         end
 
         bootstrap_options[:tags]  = default_tags(machine_spec, bootstrap_options[:tags] || {})
 
-        if !bootstrap_options[:image_id]
+        if !bootstrap_options[:image_id] && !bootstrap_options[:image]
           if !bootstrap_options[:image_distribution] && !bootstrap_options[:image_name]
             bootstrap_options[:image_distribution] = 'CentOS'
             bootstrap_options[:image_name] = '6.5 x64'
           end
           distributions = compute.images.select { |image| image.distribution == bootstrap_options[:image_distribution] }
@@ -43,48 +43,48 @@
           end
           images = distributions.select { |image| image.name == bootstrap_options[:image_name] } if bootstrap_options[:image_name]
           if images.empty?
             raise "No images on DigitalOcean with distribution #{bootstrap_options[:image_distribution].inspect} and name #{bootstrap_options[:image_name].inspect}"
           end
-          bootstrap_options[:image_id] = images.first.id
+          bootstrap_options[:image] = images.first.id
         end
-        if !bootstrap_options[:flavor_id]
+        if !bootstrap_options[:flavor_id] && !bootstrap_options[:size]
           bootstrap_options[:flavor_name] ||= '512MB'
           flavors = compute.flavors.select do |f|
-            f.name == bootstrap_options[:flavor_name]
+            f.slug.downcase == bootstrap_options[:flavor_name].downcase
           end
           if flavors.empty?
             raise "Could not find flavor named '#{bootstrap_options[:flavor_name]}' on #{driver_url}"
           end
-          bootstrap_options[:flavor_id] = flavors.first.id
+          bootstrap_options[:size] = flavors.first.slug
         end
-        if !bootstrap_options[:region_id]
+        if !bootstrap_options[:region]
           bootstrap_options[:region_name] ||= 'San Francisco 1'
           regions = compute.regions.select { |region| region.name == bootstrap_options[:region_name] }
           if regions.empty?
             raise "Could not find region named '#{bootstrap_options[:region_name]}' on #{driver_url}"
           end
-          bootstrap_options[:region_id] = regions.first.id
+          bootstrap_options[:region] = regions.first.slug
         end
         keys = compute.ssh_keys.select { |k| k.name == bootstrap_options[:key_name] }
         if keys.empty?
           raise "Could not find key named '#{bootstrap_options[:key_name]}' on #{driver_url}"
         end
         found_key = keys.first
-        bootstrap_options[:ssh_key_ids] ||= [ found_key.id ]
+        bootstrap_options[:ssh_keys] ||= [ found_key.id ]
 
         # You don't get to specify name yourself
         bootstrap_options[:name] = machine_spec.name
-
+        bootstrap_options[:version] ||= :v2
         bootstrap_options
       end
 
       def destroy_machine(action_handler, machine_spec, machine_options)
         server = server_for(machine_spec)
-        if server && server.state != 'archive'
+        if server && server.status != 'archive'
           action_handler.perform_action "destroy machine #{machine_spec.name} (#{machine_spec.location['server_id']} at #{driver_url})" do
-            server.destroy
+            server.delete
           end
         end
         machine_spec.location = nil
         strategy = convergence_strategy_for(machine_spec, machine_options)
         strategy.cleanup_convergence(action_handler, machine_spec)
@@ -93,41 +93,17 @@
       def self.compute_options_for(provider, id, config)
         new_compute_options = {}
         new_compute_options[:provider] = provider
         new_config = { :driver_options => { :compute_options => new_compute_options }}
         new_defaults = {
-          :driver_options  => { :compute_options => {} },
+          :driver_options  => { :compute_options => { version: :v2 } },
           :machine_options => { :bootstrap_options => {}, :ssh_options => {} }
         }
         result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
 
-        new_compute_options[:digitalocean_client_id] = id if (id && id != '')
+        new_compute_options[:digitalocean_token] = id if (id && id != '')
 
-        # 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_bootstrap_options = new_defaults[:machine_options][:bootstrap_options]
-          if tugboat_data['authentication']
-            new_compute_options[:digitalocean_client_id] = tugboat_data['authentication']['client_key'] if tugboat_data['authentication']['client_key'] && tugboat_data['authentication']['client_key'].size > 0
-            new_compute_options[:digitalocean_api_key]   = tugboat_data['authentication']['api_key']    if tugboat_data['authentication']['api_key']    && tugboat_data['authentication']['api_key'].size > 0
-          end
-          if tugboat_data['defaults']
-            new_bootstrap_options[:region_id] = tugboat_data['defaults']['region'].to_i if tugboat_data['defaults']['region'] && tugboat_data['defaults']['region'].size > 0
-            new_bootstrap_options[:image_id]  = tugboat_data['defaults']['image'].to_i  if tugboat_data['defaults']['image']  && tugboat_data['defaults']['image'].size > 0
-            new_bootstrap_options[:size_id]   = tugboat_data['defaults']['size'].to_i   if tugboat_data['defaults']['size']   && tugboat_data['defaults']['size'].size > 0
-            new_bootstrap_options[:private_networking] = (tugboat_data['defaults']['private_networking'] == 'true') if tugboat_data['defaults']['private_networking'] && tugboat_data['defaults']['private_networking'].size > 0
-            new_bootstrap_options[:backups_enabled]    = (tugboat_data['defaults']['backups_enabled']    == 'true') if tugboat_data['defaults']['backups_enabled'] && tugboat_data['defaults']['backups_enabled'].size > 0
-            new_bootstrap_options[:key_name] = tugboat_data['defaults']['ssh_key'] if tugboat_data['defaults']['ssh_key'] && tugboat_data['defaults']['ssh_key'].size > 0
-          end
-          if tugboat_data['ssh']
-            new_bootstrap_options[:key_path] = tugboat_data['ssh']['ssh_key_path'] if tugboat_data['ssh']['ssh_key_path'] && tugboat_data['ssh']['ssh_key_path'].size > 0
-            new_defaults[:machine_options][:ssh_options][:port] = tugboat_data['ssh']['ssh_port'] if tugboat_data['ssh']['ssh_port'] if tugboat_data['ssh']['ssh_port'].size > 0
-          end
-        end
-
-        [result, new_compute_options[:digitalocean_client_id]]
+        [result, new_compute_options[:digitalocean_token]]
       end
 
     end
   end
 end