kitchen-openstack 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140b00aba886334a4da296bc6d3e6fb8777f002c
-  data.tar.gz: 1220ac0c3fa7569c320a732923bbe37704227517
+  metadata.gz: cb6b914b94611866e422dabc3cf49b12b27a669e
+  data.tar.gz: 8afa9715342e7030ef1ff79502f52ee903093380
 SHA512:
-  metadata.gz: e4c827d8f26500ac3cf9650d56db7202c5616e4da400ef0ce5d78943bab7bfa305422a46e8cb0683c86421d1baa7d6f144a25690d11a8b032e0cb3fb0f0b9a13
-  data.tar.gz: 8e780867cc2b7b8163fb3fbb6b144fae3329028cfc07aaa2a505f00ee0aa833300083d06a1980575db46d15239df1843509387c51ae4487aacbe179333061105
+  metadata.gz: 50a5e198899b658931381439aace29a5f745c64e76ffe9e9db64a227aac60157fe1fd3836b956f09eda16f471b4b8f72662e93b27ad64f9db642896bc8c981a9
+  data.tar.gz: 31181fa626deffd2467bcf84ebb5e49b1545d70169feebd9687f99000494457268af995964116e5bfac1921b559010136a6ec3364b4a52d04e4a2d02516d4a9d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.8.1 / 2015-07-22
+
+### Bug Fixes
+
+* PR [#88][] - Fail immediately and with a more understandable message if
+  required SSH configs can't be found
+
 # 1.8.0 / 2015-04-08
 
 ### New Features
@@ -144,6 +151,7 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#88]: https://github.com/test-kitchen/kitchen-openstack/pull/88
 [#74]: https://github.com/test-kitchen/kitchen-openstack/pull/74
 [#70]: https://github.com/test-kitchen/kitchen-openstack/pull/70
 [#66]: https://github.com/test-kitchen/kitchen-openstack/pull/66

data/README.md

@@ -1,8 +1,14 @@
-[![Gem Version](https://badge.fury.io/rb/kitchen-openstack.png)](http://badge.fury.io/rb/kitchen-openstack)
-[![Build Status](https://travis-ci.org/test-kitchen/kitchen-openstack.png?branch=master)](https://travis-ci.org/test-kitchen/kitchen-openstack)
-[![Code Climate](https://codeclimate.com/github/test-kitchen/kitchen-openstack.png)](https://codeclimate.com/github/test-kitchen/kitchen-openstack)
-[![Coverage Status](https://coveralls.io/repos/test-kitchen/kitchen-openstack/badge.png)](https://coveralls.io/r/test-kitchen/kitchen-openstack)
-[![Dependency Status](https://gemnasium.com/test-kitchen/kitchen-openstack.png)](https://gemnasium.com/test-kitchen/kitchen-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
 
 # Kitchen::OpenStack
 
@@ -25,6 +31,10 @@ Or install it yourself as:
 
     $ gem install kitchen-openstack
 
+Or if using [chefdk](https://downloads.chef.io/chef-dk) install with:
+
+    $ chef gem install kitchen-openstack
+
 ## Usage
 
 Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
@@ -32,7 +42,7 @@ Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
     driver:
       name: openstack
       openstack_username: [YOUR OPENSTACK USERNAME]
-      openstack_api_key: [YOUR OPENSTACK API KEY]
+      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]
@@ -53,7 +63,7 @@ behavior can be overridden with additional options:
     password: [SSH PASSWORD]
     port: [SSH PORT]
     key_name: [SSH KEY NAME]
-    openstack_tenant: [YOUR OPENSTACK TENANT ID]
+    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]
@@ -75,10 +85,10 @@ behavior can be overridden with additional options:
       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]
-       
-If a `server_name_prefix` is specified then this prefix will be used when 
+
+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 
+`myproject-asdfghjk`. If both `server_name_prefix` and `server_name` are
 specified then the `server_name` takes precedence.
 
 If a `key_name` is provided it will be used instead of any

data/lib/kitchen/driver/openstack.rb

@@ -38,12 +38,12 @@ module Kitchen
       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 = 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'
+        driver[:private_key_path] + '.pub' if driver[:private_key_path]
       end
       default_config :username, 'root'
       default_config :password, nil
@@ -62,6 +62,14 @@ module Kitchen
       default_config :no_ssh_tcp_check_sleep, 120
       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,
+               'Either a `:public_key_path` or `:key_name` is required')
+        end
+      end
+
       def create(state)
         unless config[:server_name]
           if config[:server_name_prefix]
@@ -274,7 +282,8 @@ module Kitchen
 
       def get_public_private_ips(server)
         begin
-          pub, priv = server.public_ip_addresses, server.private_ip_addresses
+          pub = server.public_ip_addresses
+          priv = server.private_ip_addresses
         rescue Fog::Compute::OpenStack::NotFound, Excon::Errors::Forbidden
           # See Fog issue: https://github.com/fog/fog/issues/2160
           addrs = server.addresses
@@ -300,7 +309,8 @@ module Kitchen
       end
 
       def parse_ips(pub, priv)
-        pub, priv = Array(pub), Array(priv)
+        pub = Array(pub)
+        priv = Array(priv)
         if config[:use_ipv6]
           [pub, priv].each { |n| n.select! { |i| IPAddr.new(i).ipv6? } }
         else

data/lib/kitchen/driver/openstack_version.rb

@@ -2,7 +2,7 @@
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
-# Copyright (C) 2013, Jonathan Hartman
+# Copyright (C) 2013-2015, Jonathan Hartman
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '1.8.0'
+    OPENSTACK_VERSION = '1.8.1'
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -34,6 +34,29 @@ describe Kitchen::Driver::Openstack do
     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
     context 'default options' do
       it 'uses the normal SSH status check' do
@@ -802,7 +825,7 @@ describe Kitchen::Driver::Openstack do
 
       it 'raises an exception' do
         expect { driver.send(:attach_ip_from_pool, server, pool) }.to \
-          raise_error
+          raise_error(Kitchen::ActionFailed)
       end
     end
   end
@@ -944,7 +967,8 @@ describe Kitchen::Driver::Openstack do
 
     context 'no IP addresses whatsoever' do
       it 'raises an exception' do
-        expect { driver.send(:get_ip, server) }.to raise_error
+        expected = Kitchen::ActionFailed
+        expect { driver.send(:get_ip, server) }.to raise_error(expected)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver