kitchen-openstack 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b45b8838c9ce9a545a07a8901639a6eb32ddd42
-  data.tar.gz: 7f1064f7e1b13a831174e2b04c8545f4f22eb4ee
+  metadata.gz: e830463daf8d4d150001659002c7ff5fa7c4c4de
+  data.tar.gz: c13997f2c1b6ace249a892d02f34e5f9072a1b2e
 SHA512:
-  metadata.gz: 4668a5ee747b461c5cf2402f136e82fec77b76e7a43836bd8987c0f3b1054caaaf2e860dd4c3c4776f17e85677220a56a9194d3387b800e6a0e866dd71cfea7a
-  data.tar.gz: d680ce65e0b59b420afa1375c8c290d50d6141dfdea5bfee781de7e4cd9c89cf4d8adfbd6a18471cf58f7ce4dda32e641258594a3839e821af6fc140e945bc8a
+  metadata.gz: 4f4e9a1af44350c69f720ab08c04141a38460a4ade5d0515a3376e18271e3f8ca010dcd8a68afbf281ee89913a8f5654759c5e2c264624b04ad44055f1fae3a0
+  data.tar.gz: 7c17dc8168d7ca657373d9ee09da2a25aea19be14caa1b456b92154059c609a57e9c3b209ba46e4bffe0fd44e550b380bea5f95f2aff2a90cd8cf25eec0919e1

data/.gitignore

@@ -18,3 +18,6 @@ tmp
 .kitchen
 *.sw?
 *~
+.direnv/
+.envrc
+.ruby-version

data/.rubocop.yml

@@ -3,9 +3,13 @@ CyclomaticComplexity:
 MethodLength:
   Max: 30
 ClassLength:
-  Max: 300
+  Max: 320
 ClassVars:
   Enabled: false
+BlockLength:
+  Enabled: false
+ConditionalAssignment:
+  Enabled: false
 PerceivedComplexity:
   Max: 10
 AbcSize:

data/.travis.yml

@@ -7,5 +7,6 @@ gemfile:
   - Gemfile
 
 rvm:
-  - 2.0.0
-  - ruby-head
+  - ruby-head
+  - 2.3.1
+  - 2.2.5

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # Change Log
 
-## [v3.1.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.1.0)
+## [v3.2.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.2.0)
 
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.1.0...v3.2.0)
+
+**Closed issues:**
+
+- Enhancement: generate openstack keypair on create [\#150](https://github.com/test-kitchen/kitchen-openstack/issues/150)
+- kitchen-openstack should use SSH Agent [\#149](https://github.com/test-kitchen/kitchen-openstack/issues/149)
+- Permission Denied on kitchen runs after first [\#146](https://github.com/test-kitchen/kitchen-openstack/issues/146)
+- Config-drive [\#143](https://github.com/test-kitchen/kitchen-openstack/issues/143)
+- Support Identity v3 [\#137](https://github.com/test-kitchen/kitchen-openstack/issues/137)
+
+**Merged pull requests:**
+
+- Expose excon timeout configuration [\#156](https://github.com/test-kitchen/kitchen-openstack/pull/156) ([MariusCC](https://github.com/MariusCC))
+- Dynamically allocate Floating IP for the test server. [\#155](https://github.com/test-kitchen/kitchen-openstack/pull/155) ([dannytrigo](https://github.com/dannytrigo))
+- Defer ssh key handling to transport. [\#154](https://github.com/test-kitchen/kitchen-openstack/pull/154) ([cliles](https://github.com/cliles))
+- fix failing to get IP when there is no public IP. [\#152](https://github.com/test-kitchen/kitchen-openstack/pull/152) ([onceking](https://github.com/onceking))
+
+## [v3.1.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.1.0) (2016-06-02)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.0.0...v3.1.0)
 
 **Closed issues:**
@@ -10,6 +28,7 @@
 
 **Merged pull requests:**
 
+- v3.1.0 [\#145](https://github.com/test-kitchen/kitchen-openstack/pull/145) ([jjasghar](https://github.com/jjasghar))
 - Add config drive [\#144](https://github.com/test-kitchen/kitchen-openstack/pull/144) ([bradkwadsworth](https://github.com/bradkwadsworth))
 - Update to check IP version when using `openstack\_network\_name`. [\#142](https://github.com/test-kitchen/kitchen-openstack/pull/142) ([nmische](https://github.com/nmische))
 - minor grammar tweak to sleep message [\#140](https://github.com/test-kitchen/kitchen-openstack/pull/140) ([dpetzel](https://github.com/dpetzel))

data/README.md

@@ -104,30 +104,6 @@ specified then the `server_name` takes precedence.
 
 If you want to have a static prefix for a random server name.
 
-### private\_key\_path
-
-The path to your private ssh key.
-
-### public\_key\_path
-
-The path to your public ssh key.
-
-If a `key_name` is provided it will be used instead of any
-`public_key_path` that is specified.
-
-If a `key_name` is provided without any `private_key_path`, unexpected
-behavior may result if your local RSA/DSA private key doesn't match that
-OpenStack key. If you do key injection via `cloud-init` like this issue:
-[#77](https://github.com/test-kitchen/kitchen-openstack/issues/77). The
-`key_name` should be a blank string if you need to skip it. Example:
-
-```yml
-driver:
-  [-- snip --]
-  key_name: ""
-  user_data: cloud_init
-```
-
 ### port
 
 Set the SSH port for the remote access.
@@ -156,6 +132,13 @@ connections you want declare this.
 ### glance\_cache\_wait\_timeout
 When OpenStack downloads the image into cache, it takes extra time to provision.  Timeout controls maximum amount of time to wait for machine to move from the Build/Spawn phase to Active.
 
+### connect\_timeout
+Connect timeout controls maximum amount of time to wait for machine to respond to ssh login request.
+
+### read\_timeout
+### write\_timeout
+Expose read/write timeout parameters passed down to HTTP connection created via [excon](https://github.com/excon/excon). Default timeouts (from excon) are 60 seconds.
+
 ### server\_wait
 
 `server_wait` is a workaround to deal with how some VMs with `cloud-init`.
@@ -226,6 +209,14 @@ The default is `false`.
 **Deprecated** You should be using transport now. This will sleep for so many seconds. `no_ssh_tcp_check` needs
 to be set to `true`.
 
+### private\_key\_path
+
+**Deprecated** You should be using transport now. The guest image should use `cloud-init` or some other method to fetch key from meta-data service.
+
+### public\_key\_path
+
+**Deprecated** You should be using transport now. The guest image should use `cloud-init` or some other method to fetch key from meta-data service.
+
 ## Disk Configuration
 
 ### <a name="config-block_device_mapping"></a> block\_device\_mapping
@@ -287,9 +278,16 @@ Any floating IP will be the IP used for Test Kitchen's Remote calls to the node.
 
 ### floating\_ip\_pool
 
-A `floating_ip_pool` can be provided to acquire the first free floating ip from
-the pool to attach to the instance. It will be the IP used for Test Kitchen's
-Remote calls to the node.
+A `floating_ip_pool` can be provided to allocate a floating IP from
+the pool to the instance. If `allocate_floating_ip` is true, the IP will be allocated,
+otherwise the first free floating IP will be used.  It will be the IP used for
+Test Kitchen's Remote calls to the node. If allocated, the floating IP will be
+released once the instance is destroyed.
+
+### allocate\_floating\_ip
+
+If true, allocate a new IP from the specified `floating_ip_pool` and release is afterwards.
+Otherwise, if false (the default), an existing allocated IP.
 
 ### \[public\|private\]\_ip\_order
 
@@ -368,9 +366,13 @@ driver:
   require_chef_omnibus: [e.g. 'true' or a version number if you need Chef]
   image_ref: [SERVER IMAGE ID]
   flavor_ref: [SERVER FLAVOR ID]
+  key_name: [KEY NAME]
+  read_timeout: 180
+  write_timeout: 180
+  connect_timeout: 180
 
 transport:
-  ssh_key: /path/to/id_rsa  # probably the same as private_key_path
+  ssh_key: /path/to/id_rsa #Path to private key that matches the above openstack key_name
   connection_timeout: 10
   connection_retries: 5
   username: ubuntu

data/lib/kitchen/driver/openstack.rb

@@ -4,7 +4,7 @@
 # Author:: JJ Asghar (<jj@chef.io>)
 #
 # Copyright (C) 2013-2015, Jonathan Hartman
-# Copyright (C) 2015-2016, Chef Inc
+# Copyright (C) 2015-2017, Chef Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +27,8 @@ require_relative 'openstack/volume'
 module Kitchen
   module Driver
     # This takes from the Base Class and creates the OpenStack driver.
-    class Openstack < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength, Metrics/LineLength
+    # rubocop: disable Metrics/ClassLength
+    class Openstack < Kitchen::Driver::Base
       @@ip_pool_lock = Mutex.new
 
       kitchen_driver_api_version 2
@@ -36,15 +37,6 @@ module Kitchen
       default_config :server_name, nil
       default_config :server_name_prefix, nil
       default_config :key_name, nil
-      default_config :private_key_path do
-        %w(id_rsa id_dsa).map do |k|
-          f = File.expand_path("~/.ssh/#{k}")
-          f if File.exist?(f)
-        end.compact.first
-      end
-      default_config :public_key_path do |driver|
-        driver[:private_key_path] + '.pub' if driver[:private_key_path]
-      end
       default_config :port, '22'
       default_config :use_ipv6, false
       default_config :openstack_tenant, nil
@@ -52,6 +44,7 @@ module Kitchen
       default_config :openstack_service_name, nil
       default_config :openstack_network_name, nil
       default_config :floating_ip_pool, nil
+      default_config :allocate_floating_ip, false
       default_config :floating_ip, nil
       default_config :private_ip_order, 0
       default_config :public_ip_order, 0
@@ -62,26 +55,19 @@ module Kitchen
       default_config :no_ssh_tcp_check_sleep, 120
       default_config :glance_cache_wait_timeout, 600
       default_config :block_device_mapping, nil
-
-      required_config :private_key_path
-      required_config :public_key_path do |_, value, driver|
-        if value.nil? && driver[:key_name].nil?
-          fail(UserError, # rubocop:disable SignalException
-               'Either a `:public_key_path` or `:key_name` is required')
-        end
-      end
+      default_config :connect_timeout, 60
+      default_config :read_timeout, 60
+      default_config :write_timeout, 60
 
       # Set the proper server name in the config
       def config_server_name
         return if config[:server_name]
 
-        if config[:server_name_prefix]
-          config[:server_name] = server_name_prefix(
-            config[:server_name_prefix]
-          )
-        else
-          config[:server_name] = default_name
-        end
+        config[:server_name] = if config[:server_name_prefix]
+                                 server_name_prefix(config[:server_name_prefix])
+                               else
+                                 default_name
+                               end
       end
 
       def create(state)
@@ -119,7 +105,17 @@ module Kitchen
 
         disable_ssl_validation if config[:disable_ssl_validation]
         server = compute.servers.get(state[:server_id])
-        server.destroy unless server.nil?
+
+        unless server.nil?
+          if config[:floating_ip_pool] && config[:allocate_floating_ip]
+            ip = get_ip(server)
+            floating_ip_id = network.list_floating_ips(floating_ip_address: ip)
+                                    .body['floatingips'][0]['id']
+            network.delete_floating_ip(floating_ip_id)
+            info "OpenStack Floating IP <#{ip}> released."
+          end
+          server.destroy
+        end
         info "OpenStack instance <#{state[:server_id]}> destroyed."
         state.delete(:server_id)
         state.delete(:hostname)
@@ -129,10 +125,12 @@ module Kitchen
 
       def openstack_server
         server_def = {
-          provider: 'OpenStack'
+          provider: 'OpenStack',
+          connection_options: {}
         }
         required_server_settings.each { |s| server_def[s] = config[s] }
         optional_server_settings.each { |s| server_def[s] = config[s] if config[s] } # rubocop:disable Metrics/LineLength
+        connection_options.each { |s| server_def[:connection_options][s] = config[s] if config[s] } # rubocop:disable Metrics/LineLength
         server_def
       end
 
@@ -146,6 +144,10 @@ module Kitchen
         end - required_server_settings
       end
 
+      def connection_options
+        [:read_timeout, :write_timeout, :connect_timeout]
+      end
+
       def network
         Fog::Network.new(openstack_server)
       end
@@ -177,7 +179,6 @@ module Kitchen
 
         [
           :security_groups,
-          :public_key_path,
           :key_name,
           :user_data,
           :config_drive
@@ -278,14 +279,21 @@ module Kitchen
       def attach_ip_from_pool(server, pool)
         @@ip_pool_lock.synchronize do
           info "Attaching floating IP from <#{pool}> pool"
-          free_addrs = compute.addresses.map do |i|
-            i.ip if i.fixed_ip.nil? && i.instance_id.nil? && i.pool == pool
-          end.compact
-          if free_addrs.empty?
-            fail ActionFailed, "No available IPs in pool <#{pool}>" # rubocop:disable Metrics/LineLength, SignalException
+          if config[:allocate_floating_ip]
+            resp = network.create_floating_ip(pool)
+            ip = resp.body['floatingip']['floating_ip_address']
+            info "Attaching floating IP from <#{pool}> pool"
+            config[:floating_ip] = ip
+          else
+            free_addrs = compute.addresses.map do |i|
+              i.ip if i.fixed_ip.nil? && i.instance_id.nil? && i.pool == pool
+            end.compact
+            if free_addrs.empty?
+              fail ActionFailed, "No available IPs in pool <#{pool}>" # rubocop:disable Metrics/LineLength, SignalException
+            end
+            config[:floating_ip] = free_addrs[0]
           end
-          config[:floating_ip] = free_addrs[0]
-          attach_ip(server, free_addrs[0])
+          attach_ip(server, config[:floating_ip])
         end
       end
 
@@ -330,7 +338,7 @@ module Kitchen
         end
 
         pub, priv = get_public_private_ips(server)
-        priv ||= server.ip_addresses unless pub
+        priv = server.ip_addresses if Array(pub).empty? && Array(priv).empty?
         pub, priv = parse_ips(pub, priv)
         pub[config[:public_ip_order].to_i] ||
           priv[config[:private_ip_order].to_i] ||
@@ -339,9 +347,9 @@ module Kitchen
 
       def filter_ips(addresses)
         if config[:use_ipv6]
-          return addresses.select { |i| IPAddr.new(i['addr']).ipv6? }
+          addresses.select { |i| IPAddr.new(i['addr']).ipv6? }
         else
-          return addresses.select { |i| IPAddr.new(i['addr']).ipv4? }
+          addresses.select { |i| IPAddr.new(i['addr']).ipv4? }
         end
       end
 

data/lib/kitchen/driver/openstack_version.rb

@@ -3,7 +3,7 @@
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
 # Copyright (C) 2013-2015, Jonathan Hartman
-# Copyright (C) 2015-2016, Chef Software Inc
+# Copyright (C) 2015-2017, Chef Software Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '3.1.0'.freeze
+    OPENSTACK_VERSION = '3.2.0'.freeze
   end
 end

data/spec/kitchen/driver/openstack/volume_spec.rb

@@ -9,6 +9,7 @@ require 'rspec'
 require 'kitchen'
 require 'ohai'
 
+# rubocop: disable Metrics/BlockLength
 describe Kitchen::Driver::Openstack::Volume do
   let(:os) do
     {

data/spec/kitchen/driver/openstack_spec.rb

@@ -15,13 +15,12 @@ require 'ohai'
 require 'excon'
 require 'fog'
 
+# rubocop: disable Metrics/BlockLength
 describe Kitchen::Driver::Openstack do
   let(:logged_output) { StringIO.new }
   let(:logger) { Logger.new(logged_output) }
   let(:config) { Hash.new }
   let(:state) { Hash.new }
-  let(:dsa) { File.expand_path('~/.ssh/id_dsa') }
-  let(:rsa) { File.expand_path('~/.ssh/id_rsa') }
   let(:instance_name) { 'potatoes' }
   let(:transport)     { Kitchen::Transport::Dummy.new }
   let(:platform)      { Kitchen::Platform.new(name: 'fake_platform') }
@@ -43,31 +42,10 @@ describe Kitchen::Driver::Openstack do
     allow_any_instance_of(described_class).to receive(:instance)
       .and_return(instance)
     allow(File).to receive(:exist?).and_call_original
-    allow(File).to receive(:exist?).with(dsa).and_return(true)
-    allow(File).to receive(:exist?).with(rsa).and_return(true)
   end
 
   describe '#finalize_config' do
     before(:each) { allow(File).to receive(:exist?).and_return(false) }
-
-    context 'both private and public key info provided' do
-      let(:config) do
-        { private_key_path: '/tmp/key', public_key_path: '/tmp/key.pub' }
-      end
-
-      it 'raises no error' do
-        expect(driver.finalize_config!(instance)).to be
-      end
-    end
-
-    context 'no key information provided provided' do
-      let(:config) { {} }
-
-      it 'raises an error' do
-        expected = Kitchen::UserError
-        expect { driver.finalize_config!(instance) }.to raise_error(expected)
-      end
-    end
   end
 
   describe '#initialize' do
@@ -80,44 +58,16 @@ describe Kitchen::Driver::Openstack do
         expect(driver[:no_ssh_tcp_check_sleep]).to eq(120)
       end
 
-      context 'both DSA and RSA SSH keys available for the user' do
-        it 'prefers the local user\'s RSA private key' do
-          expect(driver[:private_key_path]).to eq(rsa)
-        end
-
-        it 'prefers the local user\'s RSA public key' do
-          expect(driver[:public_key_path]).to eq(rsa + '.pub')
-        end
+      it 'sets a default Openstack API read timeout' do
+        expect(driver[:read_timeout]).to eq(60)
       end
 
-      context 'only a DSA SSH key available for the user' do
-        before(:each) do
-          allow(File).to receive(:exist?).and_return(false)
-          allow(File).to receive(:exist?).with(dsa).and_return(true)
-        end
-
-        it 'uses the local user\'s DSA private key' do
-          expect(driver[:private_key_path]).to eq(dsa)
-        end
-
-        it 'uses the local user\'s DSA public key' do
-          expect(driver[:public_key_path]).to eq(dsa + '.pub')
-        end
+      it 'sets a default Openstack API write timeout' do
+        expect(driver[:write_timeout]).to eq(60)
       end
 
-      context 'only a RSA SSH key available for the user' do
-        before(:each) do
-          allow(File).to receive(:exist?).and_return(false)
-          allow(File).to receive(:exist?).with(rsa).and_return(true)
-        end
-
-        it 'uses the local user\'s RSA private key' do
-          expect(driver[:private_key_path]).to eq(rsa)
-        end
-
-        it 'uses the local user\'s RSA public key' do
-          expect(driver[:public_key_path]).to eq(rsa + '.pub')
-        end
+      it 'sets a default ssh connection timeout' do
+        expect(driver[:connect_timeout]).to eq(60)
       end
 
       nils = [
@@ -151,10 +101,13 @@ describe Kitchen::Driver::Openstack do
           openstack_tenant: 'that_one',
           openstack_region: 'atlantis',
           openstack_service_name: 'the_service',
-          private_key_path: '/path/to/id_rsa',
           floating_ip_pool: 'swimmers',
           floating_ip: '11111',
           network_ref: '0xCAFFE',
+          use_ssh_agent: true,
+          connect_timeout: 123,
+          read_timeout: 234,
+          write_timeout: 345,
           block_device_mapping: {
             make_volume: true,
             snapshot_id: '44',
@@ -230,7 +183,7 @@ describe Kitchen::Driver::Openstack do
         # Inside the yield block we are calling ready?  So we fake it here
         allow(d).to receive(:ready?).and_return(true)
         allow(server).to receive(:wait_for)
-          .with(an_instance_of(Fixnum)).and_yield
+          .with(an_instance_of(Integer)).and_yield
 
         allow(d).to receive(:get_ip).and_return('1.2.3.4')
         allow(d).to receive(:bourne_shell?).and_return(false)
@@ -314,6 +267,39 @@ describe Kitchen::Driver::Openstack do
         driver.destroy(state)
       end
     end
+
+    context 'Deallocate floating IP' do
+      let(:config) do
+        {
+          floating_ip_pool: 'swimmers',
+          allocate_floating_ip: true
+        }
+      end
+      let(:ip) { '1.1.1.1' }
+      let(:ip_id) { '123' }
+
+      let(:network_response) do
+        double(body: { 'floatingips' => [{ 'id' => ip_id }] })
+      end
+
+      let(:network) do
+        s = double('network')
+        expect(s).to receive(:list_floating_ips).with(floating_ip_address: ip).and_return(network_response) # rubocop:disable Metrics/LineLength
+        expect(s).to receive(:delete_floating_ip).with(ip_id)
+        s
+      end
+
+      let(:driver) do
+        d = super()
+        allow(d).to receive(:get_ip).and_return(ip)
+        allow(d).to receive(:compute).and_return(compute)
+        allow(d).to receive(:network).and_return(network)
+        d
+      end
+      it 'deallocates the ip' do
+        driver.destroy(state)
+      end
+    end
   end
 
   describe '#openstack_server' do
@@ -324,7 +310,13 @@ describe Kitchen::Driver::Openstack do
         openstack_auth_url: 'http://',
         openstack_tenant: 'me',
         openstack_region: 'ORD',
-        openstack_service_name: 'stack'
+        openstack_service_name: 'stack',
+        connection_options:
+          {
+            read_timeout: 60,
+            write_timeout: 60,
+            connect_timeout: 60
+          }
       }
     end
 
@@ -360,7 +352,13 @@ describe Kitchen::Driver::Openstack do
         openstack_auth_url: 'http:',
         openstack_tenant: 'link',
         openstack_region: 'ord',
-        openstack_service_name: 'the_service'
+        openstack_service_name: 'the_service',
+        connection_options:
+          {
+            read_timeout: 60,
+            write_timeout: 60,
+            connect_timeout: 60
+          }
       }
     end
 
@@ -402,7 +400,6 @@ describe Kitchen::Driver::Openstack do
         image_ref: '111',
         flavor_ref: '1',
         availability_zone: nil,
-        public_key_path: 'tarpals',
         block_device_mapping: {
           volume_size: '5',
           volume_id: '333',
@@ -459,26 +456,6 @@ describe Kitchen::Driver::Openstack do
       end
     end
 
-    context 'a provided public key path' do
-      let(:config) do
-        {
-          server_name: 'hello',
-          image_ref: '111',
-          flavor_ref: '1',
-          availability_zone: nil,
-          public_key_path: 'tarpals'
-        }
-      end
-      before(:each) do
-        @expected = config.merge(name: config[:server_name])
-        @expected.delete_if { |k, _| k == :server_name }
-      end
-
-      it 'passes that public key path to Fog' do
-        expect(driver.send(:create_server)).to eq(@expected)
-      end
-    end
-
     context 'a provided key name' do
       let(:config) do
         {
@@ -486,7 +463,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'montgomery',
           key_name: 'tarpals'
         }
       end
@@ -508,7 +484,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'montgomery',
           key_name: 'tarpals',
           security_groups: ['ping-and-ssh']
         }
@@ -531,7 +506,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: 'elsewhere',
-          public_key_path: 'montgomery',
           key_name: 'tarpals'
         }
       end
@@ -551,8 +525,7 @@ describe Kitchen::Driver::Openstack do
         {
           server_name: 'hello',
           image_ref: '111',
-          flavor_ref: '1',
-          public_key_path: 'tarpals'
+          flavor_ref: '1'
         }
       end
 
@@ -560,8 +533,7 @@ describe Kitchen::Driver::Openstack do
         expect(servers).to receive(:create).with(name: 'hello',
                                                  image_ref: '111',
                                                  flavor_ref: '1',
-                                                 availability_zone: nil,
-                                                 public_key_path: 'tarpals')
+                                                 availability_zone: nil)
         driver.send(:create_server)
       end
     end
@@ -571,8 +543,7 @@ describe Kitchen::Driver::Openstack do
         {
           server_name: 'hello',
           image_ref: 'fedora',
-          flavor_ref: 'small',
-          public_key_path: 'tarpals'
+          flavor_ref: 'small'
         }
       end
 
@@ -580,8 +551,7 @@ describe Kitchen::Driver::Openstack do
         expect(servers).to receive(:create).with(name: 'hello',
                                                  image_ref: '222',
                                                  flavor_ref: '2',
-                                                 availability_zone: nil,
-                                                 public_key_path: 'tarpals')
+                                                 availability_zone: nil)
         driver.send(:create_server)
       end
     end
@@ -592,8 +562,7 @@ describe Kitchen::Driver::Openstack do
           server_name: 'hello',
           # pass regex as string as yml returns string values
           image_ref: '/edo/',
-          flavor_ref: '/in/',
-          public_key_path: 'tarpals'
+          flavor_ref: '/in/'
         }
       end
 
@@ -601,8 +570,7 @@ describe Kitchen::Driver::Openstack do
         expect(servers).to receive(:create).with(name: 'hello',
                                                  image_ref: '222',
                                                  flavor_ref: '1',
-                                                 availability_zone: nil,
-                                                 public_key_path: 'tarpals')
+                                                 availability_zone: nil)
         driver.send(:create_server)
       end
     end
@@ -613,7 +581,6 @@ describe Kitchen::Driver::Openstack do
           server_name: 'hello',
           image_ref: '111',
           flavor_ref: '1',
-          public_key_path: 'tarpals',
           network_ref: '1'
         }
       end
@@ -627,7 +594,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'tarpals',
           nics: networks
         )
         driver.send(:create_server)
@@ -640,7 +606,6 @@ describe Kitchen::Driver::Openstack do
           server_name: 'hello',
           image_ref: '111',
           flavor_ref: '1',
-          public_key_path: 'tarpals',
           network_ref: 'vlan1'
         }
       end
@@ -654,7 +619,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'tarpals',
           nics: networks
         )
         driver.send(:create_server)
@@ -667,7 +631,6 @@ describe Kitchen::Driver::Openstack do
           server_name: 'hello',
           image_ref: '111',
           flavor_ref: '1',
-          public_key_path: 'tarpals',
           network_ref: %w(1 2)
         }
       end
@@ -682,7 +645,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'tarpals',
           nics: networks
         )
         driver.send(:create_server)
@@ -695,7 +657,6 @@ describe Kitchen::Driver::Openstack do
           server_name: 'hello',
           image_ref: '111',
           flavor_ref: '1',
-          public_key_path: 'tarpals',
           user_data: 'cloud-init.txt'
         }
       end
@@ -712,7 +673,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'tarpals',
           user_data: data
         )
         driver.send(:create_server)
@@ -725,7 +685,6 @@ describe Kitchen::Driver::Openstack do
           server_name: 'hello',
           image_ref: '111',
           flavor_ref: '1',
-          public_key_path: 'tarpals',
           config_drive: true
         }
       end
@@ -736,7 +695,6 @@ describe Kitchen::Driver::Openstack do
           image_ref: '111',
           flavor_ref: '1',
           availability_zone: nil,
-          public_key_path: 'tarpals',
           config_drive: true
         )
         driver.send(:create_server)
@@ -876,6 +834,29 @@ describe Kitchen::Driver::Openstack do
     end
   end
 
+  describe '#allocate_ip_from_pool' do
+    let(:server) { nil }
+    let(:pool) { 'swimmers' }
+    let(:config) { { allocate_floating_ip: true } }
+    let(:ip) { '1.1.1.1' }
+    let(:address) do
+      double(ip: ip, fixed_ip: nil, instance_id: nil, pool: pool)
+    end
+    let(:network_response) do
+      double(body: { 'floatingip' => { 'floating_ip_address' => ip } })
+    end
+    let(:network) { double(create_floating_ip: network_response) }
+
+    before(:each) do
+      allow(driver).to receive(:attach_ip).with(server, ip).and_return('bing!')
+      allow(driver).to receive(:network).and_return(network)
+    end
+
+    it 'determines an IP to attempt to attach' do
+      expect(driver.send(:attach_ip_from_pool, server, pool)).to eq('bing!')
+    end
+  end
+
   describe '#attach_ip' do
     let(:ip) { '1.1.1.1' }
     let(:addresses) { {} }
@@ -1238,12 +1219,10 @@ describe Kitchen::Driver::Openstack do
         openstack_service_name: 'stack',
         image_ref: '22',
         flavor_ref: '33',
-        public_key_path: '/tmp',
         username: 'admin',
         port: '2222',
         server_name: 'puppy',
         server_name_prefix: 'parsnip',
-        private_key_path: '/path/to/id_rsa',
         floating_ip_pool: 'swimmers',
         floating_ip: '11111',
         network_ref: '0xCAFFE',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen