kitchen-fog 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b40bf2e82fa79545da6b55c68430f7578a83557
-  data.tar.gz: 8cd22ed93fbe59e67fb76da948685ccb56c03767
+  metadata.gz: e2e1b0a298df449a085cbdbb1efb97fd4ae9d808
+  data.tar.gz: 7151432803cbdec21ee8c0cd4460ccf72fd373cb
 SHA512:
-  metadata.gz: bdfe511e6a307c5e56217dca30c88f082498ea9eb0cf36b36761cb0104650696c23ab3caae9a9448f2472c64719883486ef4df6979ac402d1644603c7b0e7149
-  data.tar.gz: 5c21fa33874143f44585b3801ab8cf84d105be44adca84c9eff6012dd94777a8c4a01ab46e2a393a8cfc521f45813e988f445f70c6d46e8dfa4dce0b795f8e6e
+  metadata.gz: 1b67603813c60c4c1102f9674a11a7ff95cf163e2c2726493f2f82973e2962e4043bbf54430bf98e9af92b827319579deb39a81e1d7e75ef48256dcd3eebffa2
+  data.tar.gz: c730813645e6ad9c3a1776bde72da9af4a508dd893ed3ccd9150424b51373dd857c14f2a5080c048887b3f5bf7c431cfad887a75bf9be1621919ece8fb59cf1b

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/TerryHowe/kitchen-fog.png?branch=master)](https://travis-ci.org/TerryHowe/kitchen-fog) [![Code Climate](https://codeclimate.com/github/TerryHowe/kitchen-fog.png)](https://codeclimate.com/github/TerryHowe/kitchen-fog)
+[![Build Status](https://travis-ci.org/TerryHowe/kitchen-fog.png?branch=master)](https://travis-ci.org/TerryHowe/kitchen-fog)
 
 # Kitchen::Fog
 
@@ -40,7 +40,7 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file.
         flavor_id: '103'
         image_id: '8c096c29-a666-4b82-99c4-c77dc70cfb40'
         networks: [ '76abe0b1-581a-4698-b200-a2e890f4eb8d' ]
-      network: '76abe0b1-581a-4698-b200-a2e890f4eb8d'
+      network_name: '76abe0b1-581a-4698-b200-a2e890f4eb8d'
       require_chef_omnibus: latest (if you'll be using Chef)
 
 By default, a unique server name will be generated and the current user's SSH
@@ -49,10 +49,10 @@ options:
 
     name: [A UNIQUE SERVER NAME]
     ssh_key: [PATH TO YOUR PRIVATE SSH KEY]
+    upload_public_ssh_key: [TRUE UPLOADS PUBLIC KEY TO SERVER]
     public_key_path: [PATH TO YOUR SSH PUBLIC KEY]
     username: [SSH USER]
     port: [SSH PORT]
-    key_name: [SSH KEY NAME]
 
 If a key\_name is provided it will be used instead of any
 public\_key\_path that is specified.

data/lib/kitchen/driver/fog.rb

@@ -35,19 +35,20 @@ module Kitchen
       default_config :port, '22'
       default_config :use_ipv6, false
       default_config :network_name, nil
+      default_config :upload_public_ssh_key, false
 
       def create(state)
         config[:name] ||= generate_name(instance.name)
         config[:disable_ssl_validation] and disable_ssl_validation
         server = create_server(state)
         unless config[:floating_ip_create].nil?
-          create_floating_ip(server)
+          create_floating_ip(server, state)
         else
           state[:hostname] = get_ip(server)
         end
         wait_for_sshd(state[:hostname]) ; puts '(ssh ready)'
-        unless config[:ssh_key] or config[:key_name]
-          do_ssh_setup(state, config, server)
+        if config[:upload_public_ssh_key]
+          upload_public_ssh_key(state, config, server)
         end
       rescue ::Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
@@ -76,25 +77,33 @@ module Kitchen
         ::Fog::Network.new(authentication)
       end
 
+      def convert_to_strings(objay)
+        if objay.kind_of?(Array)
+          objay.map { |v| convert_to_strings(v) }
+        elsif objay.kind_of?(Hash)
+          Hash[objay.map { |(k, v)| [k.to_s, convert_to_strings(v)] }]
+        else
+          objay
+        end
+      end
+
       def create_server(state)
-        server_def = config[:server_create] || {}
-        server_def = server_def.dup
-        server_def[:name] = config[:name]
-        # Can't use the Fog bootstrap and/or setup methods here; they require a
-        # public IP address that can't be guaranteed to exist across all
-        # OpenStack deployments (e.g. TryStack ARM only has private IPs).
-        server = compute.servers.create(server_def)
+        server_configed = config[:server_create] || {}
+        server_configed = server_configed.dup
+        server_configed[:name] = config[:name]
+        server_configed = convert_to_strings(server_configed)
+        server = compute.servers.create(server_configed)
         state[:server_id] = server.id
         info "Fog instance <#{state[:server_id]}> created."
         server.wait_for { print '.'; ready? } ; puts "\n(server ready)"
         server
       end
 
-      def create_floating_ip(server)
+      def create_floating_ip(server, state)
         hsh = config[:floating_ip_create].dup
-        floater = network.create_floating_ip(hsh[:floating_network_id], hsh)
-        floating_id = floater.body['floatingip']['id']
-        state[:hostname] = floater.body['floatingip']['floating_ip_address']
+        floater = network.floating_ips.create(hsh)
+        floating_id = floater.id
+        state[:hostname] = floater.floating_ip_address
         port = network.ports(:filters => { :device_id => server.id }).first
         network.associate_floating_ip(floating_id, port.id)
       end
@@ -147,7 +156,7 @@ module Kitchen
         return pub, priv
       end
 
-      def do_ssh_setup(state, config, server)
+      def upload_public_ssh_key(state, config, server)
         ssh = ::Fog::SSH.new(state[:hostname], config[:username],
           { :password => server.password })
         pub_key = open(config[:public_key_path]).read

data/lib/kitchen/driver/fog_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Fog Kitchen driver
-    FOG_VERSION = '0.6.0'
+    FOG_VERSION = '0.6.2'
   end
 end
 

data/spec/kitchen/driver/{openstack_spec.rb → fog_spec.rb}

@@ -61,6 +61,10 @@ describe Kitchen::Driver::Fog do
       it 'defaults to no network name' do
         expect(driver[:network_name]).to eq(nil)
       end
+
+      it 'defaults to no upload_public_ssh_key' do
+        expect(driver[:upload_public_ssh_key]).to eq(false)
+      end
     end
 
     context 'overridden options' do
@@ -108,7 +112,7 @@ describe Kitchen::Driver::Fog do
       d.stub(:create_server).and_return(server)
       d.stub(:wait_for_sshd).with('1.2.3.4').and_return(true)
       d.stub(:get_ip).and_return('1.2.3.4')
-      d.stub(:do_ssh_setup).and_return(true)
+      d.stub(:upload_public_ssh_key).and_return(true)
       d
     end
 
@@ -557,7 +561,7 @@ describe Kitchen::Driver::Fog do
     end
   end
 
-  describe '#do_ssh_setup' do
+  describe '#upload_public_ssh_key' do
     let(:server) { double(:password => 'aloha') }
     let(:state) { { :hostname => 'host' } }
     let(:read) { double(:read => 'a_key') }
@@ -573,7 +577,7 @@ describe Kitchen::Driver::Fog do
       driver.stub(:open).with(File.expand_path(
         '~/.ssh/id_dsa.pub')).and_return(read)
       read.stub(:read).and_return('a_key')
-      res = driver.send(:do_ssh_setup, state, config, server)
+      res = driver.send(:upload_public_ssh_key, state, config, server)
       expected = [
         'mkdir .ssh',
         'echo "a_key" >> ~/.ssh/authorized_keys',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-fog
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -139,7 +139,7 @@ files:
 - kitchen-fog.gemspec
 - lib/kitchen/driver/fog.rb
 - lib/kitchen/driver/fog_version.rb
-- spec/kitchen/driver/openstack_spec.rb
+- spec/kitchen/driver/fog_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/TerryHowe/kitchen-fog
 licenses:
@@ -166,5 +166,5 @@ signing_key:
 specification_version: 4
 summary: A Test Kitchen Fog Nova driver
 test_files:
-- spec/kitchen/driver/openstack_spec.rb
+- spec/kitchen/driver/fog_spec.rb
 - spec/spec_helper.rb