kitchen-openstack 2.0.0 → 2.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ffac59814629b9ac383483ecfe3cf01cf682589
-  data.tar.gz: 3f6a0e8daba0499e3e0033975757e3640b7e07b6
+  metadata.gz: da74b5aca0c6e35157b769c798e4dedf61763f5c
+  data.tar.gz: 8af292a126a2aff03f0840018710961cf4a71ad8
 SHA512:
-  metadata.gz: 6fa59ace07457afc636b39a2f3b61af484f8ad8463d47c18ec100bb65ed5959f6cda5b5ac795b5b5196296dec163d177b65aa6ac9de31a3ede2c26cc6e690f44
-  data.tar.gz: 2d67d31f55ae30bc95d82d1f94bc9e5d58087f228641567e85484d90d645bb38d65d2b38028dffc588a417dc7e02e9b2c55e20277d97a29a6c54957635a3809d
+  metadata.gz: cf9bf596c2e143855267fc9ebebf283ffc07822181d137a79174c66973bc1940956aaadaf64e5f9c08b164c5c4cb73a612c10928561be0bff5244959b10575cc
+  data.tar.gz: 7b95de0644e858e60f0750bb58e0657363d045fd53e6df8b4db242c8a4c933eae5488a6653ab0fa370f7d0cdf8697bf6570c5131bc25f5979d7d3541c6a64902

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.1.0.pre / 2015-XX-XX
+
+### New Features
+
+* PR [#106][] - The ability to bootstrap on only a private network paired with [@thomascate][] and [@BobbyRyterski][]
+
+### Bug Fixes
+
+* PR [#106][] - Updated the README with better formatting
+* PR [#111][] - Updated README.
+
 # 2.0.0 / 2015-09-30
 
 ### New Features
@@ -16,7 +27,7 @@
 
 ### Improvements
 
-* Updates to the readme PR [#102][] - from [@BobbyRyterski][]
+* PR [#102][] - Updates to the readme - from [@BobbyRyterski][]
 
 # 1.8.1 / 2015-07-22
 
@@ -171,7 +182,8 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
-
+[#111]: https://github.com/test-kitchen/kitchen-openstack/pull/111
+[#106]: https://github.com/test-kitchen/kitchen-openstack/pull/106
 [#104]: https://github.com/test-kitchen/kitchen-openstack/pull/104
 [#102]: https://github.com/test-kitchen/kitchen-openstack/pull/102
 [#100]: https://github.com/test-kitchen/kitchen-openstack/pull/100
@@ -213,6 +225,7 @@ certain specified NICs; via [@monsterzz][]
 [#7]: https://github.com/test-kitchen/kitchen-openstack/pull/7
 [#2]: https://github.com/test-kitchen/kitchen-openstack/pull/2
 
+[@thomascate]: https://github.com/thomascate
 [@jmahowald]: https://github.com/jmahowald
 [@dpetzel]: https://github.com/dpetzel
 [@BobbyRyterski]: https://github.com/BobbyRyterski

data/LICENSE.txt

@@ -1,6 +1,8 @@
 Author:: Jonathan Hartman (<j@p4nt5.com>)
+Author:: JJ Asghar (<jj@chef.io>)
 
 Copyright (c) 2013 Jonathan Hartman
+Copyright (c) 2015 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.

data/README.md

@@ -1,55 +1,60 @@
+# <a name="title"></a> Kitchen::OpenStack: A Test Kitchen Driver for OpenStack
+
 [![Gem Version](https://img.shields.io/gem/v/kitchen-openstack.svg)][gem]
 [![Build Status](https://img.shields.io/travis/test-kitchen/kitchen-openstack.svg)][travis]
 [![Code Climate](https://img.shields.io/codeclimate/github/test-kitchen/kitchen-openstack.svg)][codeclimate]
 [![Coverage Status](https://img.shields.io/coveralls/test-kitchen/kitchen-openstack.svg)][coveralls]
 [![Dependency Status](https://img.shields.io/gemnasium/test-kitchen/kitchen-openstack.svg)][gemnasium]
 
-[gem]: https://rubygems.org/gems/kitchen-openstack
-[travis]: https://travis-ci.org/test-kitchen/kitchen-openstack
-[codeclimate]: https://codeclimate.com/github/test-kitchen/kitchen-openstack
-[coveralls]: https://coveralls.io/r/test-kitchen/kitchen-openstack
-[gemnasium]: https://gemnasium.com/test-kitchen/kitchen-openstack
+A [Test Kitchen][kitchen_ci] Driver for [OpenStack][openstack_web].
+
+This driver uses the [fog gem][fog_web] to provision and destroy nova instances. Use an OpenStack cloud for your infrastructure testing!
 
-# Kitchen::OpenStack
+Shamelessly copied from [Fletcher Nichol](https://github.com/fnichol)'s awesome work on an [EC2 driver](https://github.com/test-kitchen/kitchen-ec2), and [Adam Leff](https://github.com/adamleff)'s amazing work on an [VRO driver](https://github.com/chef-partners/kitchen-vro).
 
-An OpenStack Nova driver for Test Kitchen 1.0!
+## Requirements
 
-Shamelessly copied from [Fletcher Nichol](https://github.com/fnichol)'s
-awesome work on an [EC2 driver](https://github.com/test-kitchen/kitchen-ec2),
-and [Adam Leff](https://github.com/adamleff)'s
-amazing work on an [VRO driver](https://github.com/chef-partners/kitchen-vro).
+There are **no** external system requirements for this driver. However you will need access to an OpenStack cloud.
 
-## Installation
+## Installation and Setup
 
 Add this line to your application's Gemfile:
 
-    gem 'kitchen-openstack'
+```ruby
+gem 'kitchen-openstack'
+```
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install kitchen-openstack
-
-Or if using [chefdk](https://downloads.chef.io/chef-dk) install with:
+```bash
+$ gem install kitchen-openstack
+```
 
-    $ chef gem install kitchen-openstack
+Or if using [chefdk][chefdk_dl] install with:
 
-## Usage
+```bash
+$ chef gem install kitchen-openstack
+```
 
-Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
+## Minimum Configuration
 
 ```yaml
 driver:
   name: openstack
   openstack_username: [YOUR OPENSTACK USERNAME]
-  openstack_api_key: [YOUR OPENSTACK API KEY] # AKA your OPENSTACK PASSWORD
+  openstack_api_key: [YOUR OPENSTACK API KEY] # AKA your OpenStack Password
   openstack_auth_url: [YOUR OPENSTACK AUTH URL]
   require_chef_omnibus: [e.g. 'true' or a version number if you need Chef]
   image_ref: [SERVER IMAGE ID]
   flavor_ref: [SERVER FLAVOR ID]
+transport:
+  username: ubuntu # For a Ubuntu Box
 ```
 
 The `image_ref` and `flavor_ref` options can be specified as an exact id,
@@ -58,81 +63,54 @@ an exact name, or as a regular expression matching the name of the image or flav
 All of Fog's `openstack` options (`openstack_domain_name`, `openstack_project_name`,
 ...) are supported. This includes support for the OpenStack Identity v3 API.
 
-Test Kitchen 1.4 supports multiple transports, and transports can be configure globally:
+## General Configuration
 
-```yaml
-transport:
-  username: ubuntu
-  password: mysecretpassword
-```
+### name
 
-... or per-platform:
+**Required** Tell test-kitchen what driver to use. ;)
 
-```yaml
-platforms:
-  name: ubuntu-14.04
-  transport:
-    password: myrootpassword
-  name: windows-2012r2
-    password: myadministratorpassword
-```
+### openstack\_username
 
-Transports also control key based authentication:
+**Required** Your OpenStack username.
 
-```yaml
-transport:
-  username: ubuntu
-  ssh_key: /path/to/key # probably the same as private_key_path
-```
+### openstack\_api\_key
+
+**Required** Your OpenStack API Key, aka your OpenStack password.
+
+### openstack\_auth\_url
 
-See issues [#77](https://github.com/test-kitchen/kitchen-openstack/issues/77)
-and [#101](https://github.com/test-kitchen/kitchen-openstack/issues/101)
-for more information on using SSH keys.
-
-By default, a unique server name will be generated and the current user's SSH
-key will be used (with an RSA key taking precedence over a DSA), though that
-behavior can be overridden with additional options:
-
-    server_name: [A UNIQUE SERVER NAME]
-    server_name_prefix: [STATIC PREFIX FOR RANDOM SERVER NAME]
-    private_key_path: [PATH TO YOUR PRIVATE SSH KEY]
-    public_key_path: [PATH TO YOUR SSH PUBLIC KEY]
-    username: [SSH USER]
-    password: [SSH PASSWORD]
-    port: [SSH PORT]
-    key_name: [SSH KEY NAME]
-    openstack_tenant: [YOUR OPENSTACK TENANT NAME]
-    openstack_region: [A VALID OPENSTACK REGION]
-    availability_zone: [AN OPENSTACK AVAILABILITY ZONE]
-    openstack_service_name: [YOUR OPENSTACK COMPUTE SERVICE NAME]
-    openstack_network_name: [YOUR OPENSTACK NETWORK NAME USED TO CONNECT]
-    security_groups:
-      - [A LIST OF...]
-      - [...SECURITY GROUPS TO JOIN]
-    network_ref:
-      - [OPENSTACK NETWORK NAMES OR...]
-      - [...ID TO CREATE INSTANCE WITH]
-    no_ssh_tcp_check: [DEFAULTS TO false, SKIPS TCP CHECK WHEN true]
-    no_ssh_tcp_check_sleep: [NUM OF SECONDS TO SLEEP IF no_ssh_tcp_check IS SET]
-    block_device_mapping:
-      make_volume: [DEFAULTS TO false, MAKES A NEW VOLUME WHEN true]
-      snapshot_id: [WHEN SET WILL MAKE VOLUME FROM VOLUME SNAPSHOT]
-      volume_id: [WILL ATTACH VOLUME WHEN SET]
-      volume_size: [THE SIZE OF THE VOLUME TO BE ATTACHED/MADE]
-      device_name: [SET TO vda UNLESS YOU KNOW WHAT YOU ARE DOING]
-      availability_zone: [THE BLOCK STORAGE AVAILABILITY ZONE, DEFAULTS TO nova]
-      volume_type: [THE VOLUME TYPE, THIS IS OPTIONAL]
-      delete_on_termination: [WILL DELETE VOLUME ON INSTANCE DESTROY WHEN true, OTHERWISE SET TO false]
-      winrm_wait: [DEFAULTS TO 0, BUT THIS HELPS CONFIRM WINRM IS IN A GOOD STATE BEFORE TRYING TO CONNECT]
+**Required** Your OpenStack auth url.
+
+### require\_chef_omnibus
+
+**Required** Set to `true` otherwise the specific version of Chef omnibus you want installed.
+
+### image\_ref
+
+**Required** Server Image ID.
+
+### flavor\_ref
+
+**Required** Server Flavor ID.
+
+### server\_name
 
 If a `server_name_prefix` is specified then this prefix will be used when
 generating random names of the form `<NAME PREFIX>-<RANDOM STRING>` e.g.
 `myproject-asdfghjk`. If both `server_name_prefix` and `server_name` are
 specified then the `server_name` takes precedence.
 
-`winrm_wait` is a workaround to deal with how WinRM comes up during machine
-creation. With `cloud-init` running on most OpenStack instances having this
-wait makes sure that the machine is in a good state to work with.
+### server\_name\_prefix
+
+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.
@@ -143,12 +121,144 @@ OpenStack key. If you do key injection via `cloud-init` like this issue:
 [#77](https://github.com/test-kitchen/kitchen-openstack/issues/77) the best
 way is to make a "dummy-key."
 
-A specific `floating_ip` or the ID of a `floating_ip_pool` can be provided to
-bind a floating IP to the node. Any floating IP will be the IP used for
-Test Kitchen's SSH calls to the node.
+### username
+
+**Deprecated** SSH User name, you should be using transport now.
+
+### password
+
+**Deprecated** SSH password, you should be using transport now.
+
+### port
+
+Set the SSH port for the remote access.
+
+### openstack\_tenant
+
+Your OpenStack tenant id.
+
+### openstack\_region
+
+Your OpenStack region id.
+
+### availability\_zone
+
+Your OpenStack availablity zone.
+
+### openstack\_service\_name
+
+Your OpenStack compute service name.
+
+### openstack\_network\_name
+
+Your OpenStack network name used to connect to, if you have only private network
+connections you want declare this.
+
+### server\_wait
+
+`server_wait` is a workaround to deal with how some VMs with `cloud-init`.
+Some clouds need this some, most OpenStack instances don't. This is a stop gap
+wait makes sure that the machine is in a good state to work with. Ideally the
+transport layer in Test-Kitchen will have a more intelligent way to deal with this.
+You may want to add this for **WinRM** instances due to the multiple restarts that
+happen on creation and boot. A good default is `300` seconds to make sure it's
+in a good state.
+
+The default is `0`.
+
+### security\_groups
+
+A list of `security_groups` to join:
+
+```yaml
+security_groups:
+   - [A LIST OF...]
+   - [...SECURITY GROUPS TO JOIN]
+```
+
+### network\_ref
+
+**Deprecated** A list of network names or ids to create instances with.
+
+```yaml
+network_ref:
+   - [OPENSTACK NETWORK NAMES OR...]
+   - [...ID TO CREATE INSTANCE WITH]
+```
+
+### no\_ssh\_tcp\_check
+
+**Deprecated** You should be using transport now. This will skip the ssh check to automatically connect.
+
+The default is `false`.
+
+### no\_ssh\_tcp\_check\_sleep
 
-    floating_ip: [A SPECIFIC FLOATING IP TO ASSIGN]
-    floating_ip_pool: [AN OPENSTACK POOL NAME TO ASSIGN THE NEXT IP FROM]
+**Deprecated** You should be using transport now. This will sleep for so many seconds. `no_ssh_tcp_check` needs
+to be set to `true`.
+
+## Disk Configuration
+
+### <a name="config-block_device_mappings"></a> block\_device\_mappings
+
+#### make\_volume
+
+Makes a new volume when set to `true`.
+
+The default is `false`.
+
+#### snapshot\_id
+
+When set, will make a volume from that snapshot id.
+
+#### volume\_id
+
+When set, will attach the volume id.
+
+#### device\_name
+
+Set this to `vda` unless you really know what you are doing.
+
+#### availability\_zone
+
+The block storage availability zone.
+
+The default is `nova`.
+
+#### volume\_type
+
+The volume type, this is optional.
+
+#### delete\_on\_termination
+
+This will delete the volume on the instance when `destroy` happens, if set to true.
+Otherwise set this to `false`.
+
+#### Example
+
+```yaml
+block_device_mappings:
+  make_volume: true
+  snapshot_id: 00000-111111-0000222-000
+  device_name: vda
+  availability_zone: nova
+  delete_on_termination: false
+```
+
+## Network and Communication Configuration
+
+### floating\_ip
+
+A specific `floating_ip` can be provided to bind a floating IP to the node.
+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.
+
+### \[public\|private\]\_ip\_order
 
 In some complex network scenarios you can have several IP addresses designated
 as public or private. Use `public_ip_order` or `private_ip_order` to control
@@ -168,20 +278,26 @@ to use second `10.0.1.1` IP address you need to specify
 
 ```yaml
   private_ip_order: 1
-
 ```
 assuming that test network is configured as private.
 
+
+### network\_ref
+
 The `network_ref` option can be specified as an exact id, an exact name,
 or as a regular expression matching the name of the network. You can pass one
 
-    network_ref: MYNET1
+```yaml
+  network_ref: MYNET1
+```
 
 or many networks
 
-    network_ref:
-      - MYNET1
-      - MYNET2
+```yaml
+network_ref:
+  - MYNET1
+  - MYNET2
+```
 
 The `openstack_network_name` is used to select IP address for SSH connection.
 It's recommended to specify this option in case of multiple networks used for
@@ -190,16 +306,94 @@ instance to provide more control over network connectivity.
 Please note that `network_ref` relies on Network Services (`Fog::Network`) and
 it can be unavailable in your OpenStack installation.
 
-    disable_ssl_validation: true
+
+### disable\_ssl\_validation
+
+```yaml
+  disable_ssl_validation: true
+```
 
 Only disable SSL cert validation if you absolutely know what you are doing,
 but are stuck with an OpenStack deployment without valid SSL certs.
 
-## Contributing
+## Example
+
+The following could be used in a `.kitchen.yml` or in a `.kitchen.local.yml`
+to override default configuration.
+
+```yaml
+---
+driver:
+  name: openstack
+  openstack_username: [YOUR OPENSTACK USERNAME]
+  openstack_api_key: [YOUR OPENSTACK API KEY] # AKA your OPENSTACK PASSWORD
+  openstack_auth_url: [YOUR OPENSTACK AUTH URL]
+  require_chef_omnibus: [e.g. 'true' or a version number if you need Chef]
+  image_ref: [SERVER IMAGE ID]
+  flavor_ref: [SERVER FLAVOR ID]
+
+transport:
+  ssh_key: /path/to/id_rsa  # probably the same as private_key_path
+  connection_timeout: 10
+  connection_retries: 5
+  username: ubuntu
+  password: mysecreatpassword
 
-1. Fork it
+platforms:
+  - name: ubuntu-14.04
+  - name: ubuntu-15.04
+  - name: centos-7
+    transport:
+      username: centos
+  - name: windows-2012r2
+    transport:
+      password: myadministratorpassword
+
+suites:
+# ...
+```
+
+## <a name="development"></a> Development
+
+* Source hosted at [GitHub][repo]
+* Report issues/questions/feature requests on [GitHub Issues][issues]
+
+Pull requests are very welcome! Make sure your patches are well tested.
+Ideally create a topic branch for every separate change you make. For
+example:
+
+1. Fork the repo
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Run style checks and RSpec tests (`bundle exec rake`)
-4. Commit your changes (`git commit -am 'Add some feature'`)
+3. Run the tests and rubocop, `bundle exec rake spec` and `bundle exec rake rubocop`
+4. Commit your changes (`git commit -am 'Added some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
+
+## <a name="authors"></a> Authors
+
+Created by [Jonathan Hartman][author] (<j@p4nt5.com>)
+and maintained by [JJ Asghar][maintainer] (<jj@chef.io>)
+
+## <a name="license"></a> License
+
+Apache 2.0 (see [LICENSE][license])
+
+
+[gem]: https://rubygems.org/gems/kitchen-openstack
+[travis]: https://travis-ci.org/test-kitchen/kitchen-openstack
+[codeclimate]: https://codeclimate.com/github/test-kitchen/kitchen-openstack
+[coveralls]: https://coveralls.io/r/test-kitchen/kitchen-openstack
+[gemnasium]: https://gemnasium.com/test-kitchen/kitchen-openstack
+
+[author]:           https://github.com/RoboticCheese
+[maintainer]:       https://github.com/jjasghar
+[issues]:           https://github.com/test-kitchen/kitchen-openstack/issues
+[license]:          https://github.com/test-kitchen/kitchen-openstack/blob/master/LICENSE.txt
+[repo]:             https://github.com/test-kitchen/kitchen-openstack
+[driver_usage]:     https://github.com/test-kitchen/kitchen-openstack
+[chef_omnibus_dl]:  http://www.chef.io/chef/install/
+[chefdk_dl]:        https://downloads.chef.io/chef-dk
+[kitchen_ci]:       http://kitchen.ci
+
+[openstack_web]:    http://www.openstack.org
+[fog_web]:          http://fog.io

data/lib/kitchen/driver/openstack.rb

@@ -102,6 +102,7 @@ module Kitchen
         elsif config[:floating_ip_pool]
           attach_ip_from_pool(server, config[:floating_ip_pool])
         end
+        state[:hostname] = get_ip(server)
         wait_for_server(state)
         setup_ssh(server, state) if bourne_shell?
         add_ohai_hint(state)
@@ -159,7 +160,6 @@ module Kitchen
 
       def create_server
         server_def = init_configuration
-
         if config[:network_ref]
           networks = [].concat([config[:network_ref]])
           server_def[:nics] = networks.flatten.map do |net|
@@ -303,14 +303,26 @@ module Kitchen
       end
 
       def get_ip(server)
-        unless config[:floating_ip].nil?
+        if config[:floating_ip]
           debug "Using floating ip: #{config[:floating_ip]}"
           return config[:floating_ip]
         end
+
+        # make sure we have the latest info
+        info 'Waiting for network information to be available...'
+        begin
+          w = server.wait_for { !addresses.empty? }
+          debug "Waited #{w[:duration]} seconds for network information."
+        rescue Fog::Errors::TimeoutError
+          raise ActionFailed, 'Could not get network information (timed out)'
+        end
+
+        # should also work for private networks
         if config[:openstack_network_name]
           debug "Using configured net: #{config[:openstack_network_name]}"
           return server.addresses[config[:openstack_network_name]].first['addr']
         end
+
         pub, priv = get_public_private_ips(server)
         priv ||= server.ip_addresses unless pub
         pub, priv = parse_ips(pub, priv)
@@ -381,10 +393,9 @@ module Kitchen
       end
 
       def wait_for_server(state)
-        state[:hostname] = get_ip(state)
-        if config[:winrm_wait]
-          info "Sleeping for #{config[:winrm_wait]} seconds to let WinRM start up..." # rubocop:disable Metrics/LineLength
-          countdown(config[:winrm_wait])
+        if config[:server_wait]
+          info "Sleeping for #{config[:server_wait]} seconds to let your server to start up..." # rubocop:disable Metrics/LineLength
+          countdown(config[:server_wait])
         end
         info 'Waiting for server to be ready...'
         instance.transport.connection(state).wait_until_ready

data/lib/kitchen/driver/openstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '2.0.0'
+    OPENSTACK_VERSION = '2.1.0.pre'
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -197,6 +197,7 @@ describe Kitchen::Driver::Openstack do
       allow(d).to receive(:do_ssh_setup).and_return(true)
       allow(d).to receive(:sleep)
       allow(d).to receive(:wait_for_ssh_key_access).and_return('SSH key authetication successful') # rubocop:disable Metrics/LineLength
+      allow(d).to receive(:disable_ssl_validation).and_return(false)
       d
     end
 
@@ -211,28 +212,6 @@ describe Kitchen::Driver::Openstack do
       end
     end
 
-    context 'when executed with a bourne shell' do
-      before do
-        allow(driver).to receive(:bourne_shell?).and_return(true)
-      end
-
-      it 'executes the ssh setup' do
-        expect(driver).to receive(:setup_ssh)
-        driver.create(state)
-      end
-    end
-
-    context 'when executed in a non-bourne shell' do
-      before do
-        allow(driver).to receive(:bourne_shell?).and_return(false)
-      end
-
-      it 'does not execute the ssh setup' do
-        expect(driver).not_to receive(:setup_ssh)
-        driver.create(state)
-      end
-    end
-
     context 'when a server is already created' do
       it 'does not create a new instance' do
         state[:server_id] = '123'
@@ -874,7 +853,8 @@ describe Kitchen::Driver::Openstack do
       double(addresses: addresses,
              public_ip_addresses: public_ip_addresses,
              private_ip_addresses: private_ip_addresses,
-             ip_addresses: ip_addresses)
+             ip_addresses: ip_addresses,
+             wait_for: { duration: 0 })
     end
 
     context 'both public and private IPs' do
@@ -930,15 +910,23 @@ describe Kitchen::Driver::Openstack do
       end
     end
 
+    context 'when a floating ip is provided' do
+      let(:config) { { floating_ip: '1.2.3.4' } }
+
+      it 'returns the floating ip and skips reloading' do
+        allow(driver).to receive(:config).and_return(config)
+
+        expect(server).to_not receive(:wait_for)
+        expect(driver.send(:get_ip, server)).to eq('1.2.3.4')
+      end
+    end
+
     context 'an OpenStack deployment without the floating IP extension' do
-      let(:server) do
-        s = double('server')
-        allow(s).to receive(:addresses).and_return(addresses)
-        allow(s).to receive(:public_ip_addresses).and_raise(
+      before do
+        allow(server).to receive(:public_ip_addresses).and_raise(
           Fog::Compute::OpenStack::NotFound)
-        allow(s).to receive(:private_ip_addresses).and_raise(
+        allow(server).to receive(:private_ip_addresses).and_raise(
           Fog::Compute::OpenStack::NotFound)
-        s
       end
 
       context 'both public and private IPs in the addresses hash' do
@@ -955,6 +943,22 @@ describe Kitchen::Driver::Openstack do
         end
       end
 
+      context 'when openstack_network_name is provided' do
+        let(:addresses) do
+          {
+            'public' => [{ 'addr' => '6.6.6.6' }, { 'addr' => '7.7.7.7' }],
+            'private' => [{ 'addr' => '8.8.8.8' }, { 'addr' => '9.9.9.9' }]
+          }
+        end
+        let(:config) { { openstack_network_name: 'public' } }
+
+        it 'should respond with the first address from the addresses' do
+          allow(driver).to receive(:config).and_return(config)
+
+          expect(driver.send(:get_ip, server)).to eq('6.6.6.6')
+        end
+      end
+
       context 'only public IPs in the address hash' do
         let(:addresses) do
           { 'public' => [{ 'addr' => '6.6.6.6' }, { 'addr' => '7.7.7.7' }] }
@@ -984,6 +988,17 @@ describe Kitchen::Driver::Openstack do
         expect { driver.send(:get_ip, server) }.to raise_error(expected)
       end
     end
+
+    context 'when network information is not found' do
+      before do
+        allow(server).to receive(:wait_for).and_raise(Fog::Errors::TimeoutError)
+      end
+
+      it 'raises an exception' do
+        expected = Kitchen::ActionFailed
+        expect { driver.send(:get_ip, server) }.to raise_error(expected)
+      end
+    end
   end
 
   describe '#parse_ips' do
@@ -1078,6 +1093,16 @@ describe Kitchen::Driver::Openstack do
         .and_return(read)
     end
 
+    context 'when executed in a non-bourne shell' do
+      before do
+        allow(driver).to receive(:bourne_shell?).and_return(false)
+      end
+
+      it 'does not execute the ssh setup' do
+        expect(driver).not_to receive(:setup_ssh)
+      end
+    end
+
     it 'opens an SSH session to the server' do
       expect(Fog::SSH).to receive(:new).with(state[:hostname],
                                              'root',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.pre
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -237,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2