Refactor some of the key importing code to work both on OpenStack and…

… AWS

lib/blimpy/boxes/aws.rb

@@ -42,10 +42,18 @@ def fog
 
     private
 
+    def import_key
+      material = Blimpy::Keys.public_key
+      begin
+        fog.import_key_pair(Blimpy::Keys.key_name, material)
+      rescue Fog::Compute::AWS::Error => e
+      end
+    end
+
     def create_host
       tags = @tags.merge({:Name => @name, :CreatedBy => 'Blimpy', :BlimpyFleetId => @fleet_id})
 
-      Blimpy::Keys.import_key(fog)
+      import_key
       generated_group = Blimpy::SecurityGroups.ensure_group(fog, @ports + [22])
       groups = [@group, generated_group].compact
       fog.servers.create(:image_id => @image_id,

lib/blimpy/boxes/openstack.rb

@@ -67,13 +67,22 @@ def flavor_id(name)
 
     private
 
+    def import_key
+      material = Blimpy::Keys.public_key
+      begin
+        fog.create_key_pair(Blimpy::Keys.key_name, material)
+      rescue Excon::Errors::Conflict => e
+      end
+    end
+
     def create_host
       tags = @tags.merge({:Name => @name, :CreatedBy => 'Blimpy', :BlimpyFleetId => @fleet_id})
 
       groups = [@group]
+      import_key
       fog.servers.create(:image_ref => @image_id,
                          :flavor_ref => flavor_id(@flavor),
-                         :key_name => @key_name,
+                         :key_name => Blimpy::Keys.key_name,
                          :groups => groups,
                          :name => @name,
                          :tags => tags)

lib/blimpy/keys.rb

@@ -3,7 +3,7 @@
 
 module Blimpy
   module Keys
-    def self.import_key(fog)
+    def self.public_key
       filename = File.expand_path('~/.ssh/id_rsa.pub')
       unless File.exists? filename
         filename = File.expand_path('~/.ssh/id_dsa.pub')
@@ -12,15 +12,11 @@ def self.import_key(fog)
         end
       end
 
-      material = File.open(filename, 'r').read
-      begin
-        fog.import_key_pair(key_name, material)
-      rescue Fog::Compute::AWS::Error => e
-      end
+      File.open(filename, 'r').read
     end
 
     def self.key_name
-      "Blimpy-#{ENV['USER']}@#{Socket.gethostname}"
+      "Blimpy-#{ENV['USER']}-#{Socket.gethostname}"
     end
   end
 end

spec/blimpy/keys_spec.rb

@@ -2,12 +2,12 @@
 require 'blimpy/keys'
 
 describe Blimpy::Keys do
-  describe '#import_key' do
+  describe '#public_key' do
     context 'with no SSH keys' do
       it 'should raise a SSHKeyNotFoundError' do
         File.stub(:exists?).and_return(false)
         expect {
-          subject.import_key(nil)
+          subject.public_key
         }.to raise_error(Blimpy::SSHKeyNotFoundError)
       end
     end
@@ -21,7 +21,7 @@
     it do
       hostname = 'rspec'
       Socket.should_receive(:gethostname).and_return(hostname)
-      subject.key_name.should == "Blimpy-tester@#{hostname}"
+      subject.key_name.should == "Blimpy-tester-#{hostname}"
     end
   end
 end