kitchen-openstack 0.2.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.4.0 / 2013-06-06
+
+### New Features
+
+* PR [#12][] - Support `openstack_network_name` option; via [@saketoba][]
+* PR [#11][] - Support `ssh_key` option; via [@saketoba][]
+
 # 0.2.0 / 2013-05-11
 
 ### Bug Fixes
@@ -18,9 +25,12 @@
 
 * Initial release! Woo!
 
+[#12]: https://github.com/RoboticCheese/kitchen-openstack/pull/12
+[#11]: https://github.com/RoboticCheese/kitchen-openstack/pull/11
 [#10]: https://github.com/RoboticCheese/kitchen-openstack/pull/10
 [#9]: https://github.com/RoboticCheese/kitchen-openstack/pull/9
 [#7]: https://github.com/RoboticCheese/kitchen-openstack/pull/7
 [#2]: https://github.com/RoboticCheese/kitchen-openstack/pull/2
 
+[@saketoba]: https://github.com/saketoba
 [@stevendanna]: https://github.com/stevendanna

data/README.md

@@ -39,6 +39,7 @@ key will be used, though that behavior can be overridden with additional
 options:
 
     name: [A UNIQUE SERVER NAME]
+    ssh_key: [PATH TO YOUR PRIVATE SSH KEY]
     public_key_path: [PATH TO YOUR SSH PUBLIC KEY]
     username: [SSH USER]
     port: [SSH PORT]
@@ -46,6 +47,7 @@ options:
     openstack_tenant: [YOUR OPENSTACK TENANT ID]
     openstack_region: [A VALID OPENSTACK REGION]
     openstack_service_name: [YOUR OPENSTACK COMPUTE SERVICE NAME]
+    openstack_network_name: [YOUR OPENSTACK NETWORK NAME]
 
 If a key\_name is provided it will be used instead of any
 public\_key\_path that is specified.

data/lib/kitchen/driver/openstack.rb

@@ -35,6 +35,7 @@ module Kitchen
       default_config :openstack_tenant, nil
       default_config :openstack_region, nil
       default_config :openstack_service_name, nil
+      default_config :openstack_network_name, nil
 
       def create(state)
         config[:name] ||= generate_name(instance.name)
@@ -47,7 +48,9 @@ module Kitchen
         # As a consequence of IP weirdness, the OpenStack setup() method is
         # also borked
         wait_for_sshd(state[:hostname]) ; puts '(ssh ready)'
-        config[:key_name] or do_ssh_setup(state, config, server)
+        unless config[:ssh_key] or config[:key_name]
+          do_ssh_setup(state, config, server)
+        end
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
@@ -101,7 +104,9 @@ module Kitchen
       end
 
       def get_ip(server)
-        if server.addresses['public'] and !server.addresses['public'].empty?
+        if config[:openstack_network_name]
+          return server.addresses[config[:openstack_network_name]].first['addr']
+        elsif server.addresses['public'] and !server.addresses['public'].empty?
           # server.public_ip_address stopped working in Fog 1.10.0
           return server.addresses['public'].first['addr']
         else

data/lib/kitchen/driver/openstack_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for OpenStack Kitchen driver
-    OPENSTACK_VERSION = '0.2.0'
+    OPENSTACK_VERSION = '0.4.0'
   end
 end
 

data/spec/kitchen/driver/openstack_spec.rb

@@ -78,7 +78,8 @@ describe Kitchen::Driver::Openstack do
           :name => 'puppy',
           :openstack_tenant => 'that_one',
           :openstack_region => 'atlantis',
-          :openstack_service_name => 'the_service'
+          :openstack_service_name => 'the_service',
+          :ssh_key => '/path/to/id_rsa'
         }
       end
 
@@ -88,6 +89,10 @@ describe Kitchen::Driver::Openstack do
           expect(drv[k]).to eq(v)
         end
       end
+
+      it 'SSH with user-specified private key' do
+        expect(driver[:ssh_key]).to eq('/path/to/id_rsa')
+      end
     end
   end
 
@@ -366,6 +371,21 @@ describe Kitchen::Driver::Openstack do
         expect(driver.send(:get_ip, server)).to eq('5.5.5.5')
       end
     end
+
+    context 'IPs in user-defined network group' do
+      let(:config) { { :openstack_network_name => 'mynetwork' } }
+      let(:addresses) do
+        {
+          'mynetwork' => [
+            { 'addr' => '7.7.7.7' },
+            { 'addr' => '8.8.8.8' }
+          ]
+        }
+      end
+      it 'returns a IP in user-defined network group' do
+        expect(driver.send(:get_ip, server)).to eq('7.7.7.7')
+      end
+    end
   end
 
   describe '#do_ssh_setup' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -186,3 +186,4 @@ summary: A Test Kitchen OpenStack Nova driver
 test_files:
 - spec/kitchen/driver/openstack_spec.rb
 - spec/spec_helper.rb
+has_rdoc: