kitchen-openstack 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6059fb2f510144b58793252bb820a17f15b60e1
-  data.tar.gz: 1839ff785f4c4864ecee83317e6849c13bf96919
+  metadata.gz: ada2dfc8390553bc3b419e50b3561a97a52dcb18
+  data.tar.gz: 91b3b46bd248411691f9bff8fa424c3225580cc9
 SHA512:
-  metadata.gz: 6237abba4531cb071ea8681478a3069cdc5605c8ba60bef2f9defa56a3a5519699343d000f7ed4805b825867c6123ffcd19e358760a20944529993588599f346
-  data.tar.gz: 52857088b9f309bcbe3178912f0be5318be8eb0cc587ed16b3500ea8709d415e1cd3fe8a6f6c16728e7f6537732d27bf05ace5edf9b1e8000acfde69e61c56d1
+  metadata.gz: cbf3719c9a0baf7c0e54a8618598525be1484910efe0a8d1ec3714a0c9fc3a8b705bc9776db5b2ece5f1e5b532334db814ad2e601a4b5c326a35c5cbb699a493
+  data.tar.gz: e4af2de8a2b0433441a58e50bad8557c63800d18bc07cc45633dadac0878808100e1581c8c20b39499a44b5101c054934b14e762069f278b6be557c1300debb2

data/.rubocop.yml

@@ -1,10 +1,12 @@
 CyclomaticComplexity:
-  Enabled: false
+  Max: 8
 MethodLength:
-  Enabled: false
+  Max: 30
 ClassLength:
-  Enabled: false
+  Max: 300
 ClassVars:
   Enabled: false
 PerceivedComplexity:
   Max: 10
+AbcSize:
+  Max: 41

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
+cache: bundler
 
-gemfile:
-  - Gemfile
+sudo: false
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.7.1 / 2015-01-07
+
+* PR [#70][] - Use configured password for SSH access, if provided
+
 # 1.7.0 / 2014-10-25
 
 ### New Features
@@ -134,6 +138,7 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#70]: https://github.com/test-kitchen/kitchen-openstack/pull/70
 [#66]: https://github.com/test-kitchen/kitchen-openstack/pull/66
 [#63]: https://github.com/test-kitchen/kitchen-openstack/pull/63
 [#62]: https://github.com/test-kitchen/kitchen-openstack/pull/62

data/README.md

@@ -50,6 +50,7 @@ behavior can be overridden with additional options:
     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 ID]

data/lib/kitchen/driver/openstack.rb

@@ -45,6 +45,7 @@ module Kitchen
         driver[:private_key_path] + '.pub'
       end
       default_config :username, 'root'
+      default_config :password, nil
       default_config :port, '22'
       default_config :use_ipv6, false
       default_config :openstack_tenant, nil
@@ -318,7 +319,7 @@ module Kitchen
         info "Setting up SSH access for key <#{config[:public_key_path]}>"
         ssh = Fog::SSH.new(state[:hostname],
                            config[:username],
-                           password: server.password)
+                           password: config[:password] || server.password)
         pub_key = open(config[:public_key_path]).read
         ssh.run([
           %(mkdir .ssh),

data/lib/kitchen/driver/openstack_version.rb

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

data/spec/kitchen/driver/openstack_spec.rb

@@ -1033,24 +1033,33 @@ describe Kitchen::Driver::Openstack do
     let(:server) { double(password: 'aloha') }
     let(:state) { { hostname: 'host' } }
     let(:read) { double(read: 'a_key') }
-    let(:ssh) do
-      s = double('ssh')
-      allow(s).to receive(:run) { |args| args }
-      s
+    let(:ssh) { double(run: true) }
+
+    before(:each) do
+      allow(driver).to receive(:open).with(config[:public_key_path])
+        .and_return(read)
     end
 
     it 'opens an SSH session to the server' do
-      allow(Fog::SSH).to receive(:new).with('host', 'root', password: 'aloha')
-        .and_return(ssh)
-      allow(driver).to receive(:open).with('/pub_key').and_return(read)
-      allow(read).to receive(:read).and_return('a_key')
-      res = driver.send(:do_ssh_setup, state, config, server)
-      expected = [
+      expect(Fog::SSH).to receive(:new).with(state[:hostname],
+                                             'root',
+                                             password: 'aloha').and_return(ssh)
+      expect(ssh).to receive(:run).with([
         'mkdir .ssh',
         'echo "a_key" >> ~/.ssh/authorized_keys',
         'passwd -l root'
-      ]
-      expect(res).to eq(expected)
+      ])
+      driver.send(:do_ssh_setup, state, config, server)
+    end
+
+    context 'a configured SSH password' do
+      let(:config) { super().merge(password: '12345') }
+
+      it 'uses the configured password' do
+        expect(Fog::SSH).to receive(:new)
+          .with(state[:hostname], 'root', password: '12345').and_return(ssh)
+        driver.send(:do_ssh_setup, state, config, server)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -28,6 +28,8 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::Console
 ]
 SimpleCov.minimum_coverage 90
-SimpleCov.start
+SimpleCov.start do
+  add_filter '/vendor/'
+end
 
 require_relative '../lib/kitchen/driver/openstack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver