foreman_digitalocean 0.0.3 → 0.1.0

data/app/models/concerns/fog_extensions/digitalocean/server.rb

@@ -16,16 +16,30 @@ module FogExtensions
         @flavor ||= service.flavors.get(flavor_id.to_i)
       end
 
+      def flavor_name
+        requires :flavor
+        @flavor_name ||= @flavor.try(:name)
+      end
+
       def image
         requires :image_id
         @image ||= service.images.get(image_id.to_i)
       end
 
+      def image_name
+        @image_name ||= @image.try(:name)
+      end
+
       def region
         requires :region_id
         @region ||= service.regions.get(region_id.to_i)
       end
 
+      def region_name
+        requires :region
+        @region_name ||= @region.try(:name)
+      end
+
       def ip_addresses
         [public_ip_address, private_ip_address].flatten.select(&:present?)
       end

data/app/models/foreman_digitalocean/digitalocean.rb

@@ -6,6 +6,10 @@ module ForemanDigitalocean
     validates :user, :password, :presence => true
     before_create :test_connection
 
+    after_create :setup_key_pair
+    after_destroy :destroy_key_pair
+
+
     # Not sure why it would need a url, but OK (copied from ec2)
     alias_attribute :region, :url
 
@@ -32,6 +36,7 @@ module ForemanDigitalocean
     end
 
     def create_vm(args = { })
+      args["ssh_keys"] = [ssh_key] if ssh_key
       super(args)
     rescue Fog::Errors::Error => e
       logger.error "Unhandled DigitalOcean error: #{e.class}:#{e.message}\n " + e.backtrace.join("\n ")
@@ -101,5 +106,52 @@ module ForemanDigitalocean
       )
     end
 
+
+    # this method creates a new key pair for each new DigitalOcean compute resource
+    # it should create the key and upload it to DigitalOcean
+    def setup_key_pair
+      public_key, private_key = generate_key
+      key_name = "foreman-#{id}#{Foreman.uuid}"
+      key = client.create_ssh_key key_name, public_key
+      KeyPair.create! :name => key_name, :compute_resource_id => self.id, :secret => private_key
+    rescue => e
+      logger.warn "failed to generate key pair"
+      logger.error e.message
+      logger.error e.backtrace.join("\n")
+      destroy_key_pair
+      raise
+    end
+
+    def destroy_key_pair
+      return unless key_pair
+      logger.info "removing DigitalOcean key #{key_pair.name}"
+      client.destroy_ssh_key(ssh_key.id) if ssh_key
+      key_pair.destroy
+      true
+    rescue => e
+      logger.warn "failed to delete key pair from DigitalOcean, you might need to cleanup manually : #{e}"
+    end
+
+    def ssh_key
+      @ssh_key ||= begin
+        key = client.list_ssh_keys.data[:body]["ssh_keys"].select{|i| i["name"] == key_pair.name}.first
+        if key
+          #the vm creator expects objects which respond to id, OpenStruct is the shortest solution.
+          OpenStruct.new(key)
+        else
+          nil
+        end
+      end
+    end
+
+    def generate_key
+      key = OpenSSL::PKey::RSA.new 2048
+      type = key.ssh_type
+      data = [ key.to_blob ].pack('m0')
+
+      openssh_format_public_key = "#{type} #{data}"
+      [openssh_format_public_key, key.to_pem]
+    end
+
   end
 end

data/app/views/compute_resources_vms/show/_digitalocean.html.erb

@@ -6,9 +6,8 @@
     <%= prop :private_ip_address %>
     <%= prop :state %>
     <%= prop :created_at, 'Created' %>
-    <%= prop :image_id, 'Image ID' %>
-    <%= prop @vm.image.name, 'Image' if @vm.image.present? %>
-    <%= prop :flavor_id, 'Flavor ID' %>
-    <%= prop :vm_description, "Type (flavor)" %>
+    <%= prop :image_name, 'Image' if @vm.image.present? %>
+    <%= prop :flavor_name, "Type (flavor)" %>
+    <%= prop :region_name, "Region" %>
   </table>
 </div>

data/lib/foreman_digitalocean/version.rb

@@ -1,3 +1,3 @@
 module ForemanDigitalocean
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: foreman_digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Tommy McNeely, Daniel Lobato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,46 +34,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- app/models/concerns/fog_extensions/digitalocean/image.rb
-- app/models/concerns/fog_extensions/digitalocean/server.rb
-- app/models/foreman_digitalocean/digitalocean.rb
-- app/views/api/v1/compute_resources/digitalocean.json
+- app/views/compute_resources_vms/index/_digitalocean.html.erb
+- app/views/compute_resources_vms/form/_digitalocean.html.erb
+- app/views/compute_resources_vms/show/_digitalocean.html.erb
 - app/views/api/v2/compute_resources/digitalocean.json
+- app/views/api/v1/compute_resources/digitalocean.json
 - app/views/compute_resources/form/_digitalocean.html.erb
 - app/views/compute_resources/show/_digitalocean.html.erb
-- app/views/compute_resources_vms/form/_digitalocean.html.erb
-- app/views/compute_resources_vms/index/_digitalocean.html.erb
-- app/views/compute_resources_vms/show/_digitalocean.html.erb
 - app/views/images/form/_digitalocean.html.erb
+- app/models/foreman_digitalocean/digitalocean.rb
+- app/models/concerns/fog_extensions/digitalocean/server.rb
+- app/models/concerns/fog_extensions/digitalocean/image.rb
 - lib/foreman_digitalocean.rb
-- lib/foreman_digitalocean/engine.rb
 - lib/foreman_digitalocean/version.rb
+- lib/foreman_digitalocean/engine.rb
 - locale/Makefile
+- LICENSE
+- README.md
 homepage: http://github.com/theforeman/foreman-digitalocean
 licenses:
 - GPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provision and manage DigitalOcean droplets from Foreman
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9c6b46a2acbef2577139e5b143a3338744c93812
-  data.tar.gz: 5082619fa7124d599f454a125f4977926e34b922
-SHA512:
-  metadata.gz: 5150238855d5ee6091b40bfa0d49eb9bf7b0ec21c2845bf447ca54b4f645639b6b707889528b305ee03ba9004cf857d30eee779d3448144e0a208a619b16a630
-  data.tar.gz: 3493421989e84cddfa600b2f808158e457160342d7b9cab08441c2e993a6fa18756f0775eb8444c72a7bb7dcb0afaf3b124f03670c815240762f3af5c8d83cba