kitchen-openstack 2.2.0 → 3.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cc5aec52bdc2147c02da6c0d1b87ec2bc138e54
-  data.tar.gz: d224fb8f09f751cf847c5c19fbd5457562019dd7
+  metadata.gz: 107c030eb921cc95686b8fba8975a0dc334b92cf
+  data.tar.gz: c25fd06642e32c85345d449ff2299b015aaff3da
 SHA512:
-  metadata.gz: 02e017f2e65efda1f0ed458a626795550f42b6c441f4dfb0e524b09a59abd4bb0c3c294509d8c4280d4edb5eac2d59136d8d98ca2891b935da027849e21e88de
-  data.tar.gz: ef9055f193441af5676c90f2572589c4c9c75ad19f0ad30b4cab8166dc88344d679db6f64dc96b9710fc5d9de4beb65db03e2c485b77f86c36145e14dce2fdc1
+  metadata.gz: af0616b8cde893ecdc6ff864d84e27e496d74985feccff2d7a89038a22dfa87e5347a77868c13efcd424689fd137d66f97fd19dc67fb7bded8b8e61e0fd939aa
+  data.tar.gz: 3a0358955de8b5184cb0174c4ff26973ca89aecfc7ba6c66c7f6578cfa49ff16efc6f7601017d6af072d46247f4842654a5fbe0825c7009b99e5f5abbc76f6b7

data/README.md

@@ -128,14 +128,6 @@ driver:
   user_data: cloud_init
 ```
 
-### 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.
@@ -228,7 +220,7 @@ to be set to `true`.
 
 ## Disk Configuration
 
-### <a name="config-block_device_mappings"></a> block\_device\_mappings
+### <a name="config-block_device_mapping"></a> block\_device\_mapping
 
 #### make\_volume
 
@@ -269,7 +261,7 @@ Timeout to wait for volume to become available.  If a large volume is provisione
 #### Example
 
 ```yaml
-block_device_mappings:
+block_device_mapping:
   make_volume: true
   snapshot_id: 00000-111111-0000222-000
   device_name: vda

data/kitchen-openstack.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 0.36'
   spec.add_development_dependency 'cane'
   spec.add_development_dependency 'countloc'
   spec.add_development_dependency 'rspec'

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, Chef Inc
+# Copyright (C) 2015-2016, Chef Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,8 +45,6 @@ module Kitchen
       default_config :public_key_path do |driver|
         driver[:private_key_path] + '.pub' if driver[:private_key_path]
       end
-      default_config :username, 'root'
-      default_config :password, nil
       default_config :port, '22'
       default_config :use_ipv6, false
       default_config :openstack_tenant, nil
@@ -62,14 +60,13 @@ module Kitchen
       default_config :network_ref, nil
       default_config :no_ssh_tcp_check, false
       default_config :no_ssh_tcp_check_sleep, 120
-      default_config :winrm_wait, nil
       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,
+          fail(UserError, # rubocop:disable SignalException
                'Either a `:public_key_path` or `:key_name` is required')
         end
       end
@@ -112,7 +109,6 @@ module Kitchen
         end
         state[:hostname] = get_ip(server)
         wait_for_server(state)
-        setup_ssh(server, state) if bourne_shell?
         add_ohai_hint(state)
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
@@ -216,21 +212,21 @@ module Kitchen
 
       def find_image(image_ref)
         image = find_matching(compute.images, image_ref)
-        fail(ActionFailed, 'Image not found') unless image
+        fail(ActionFailed, 'Image not found') unless image # rubocop:disable Metrics/LineLength, SignalException
         debug "Selected image: #{image.id} #{image.name}"
         image
       end
 
       def find_flavor(flavor_ref)
         flavor = find_matching(compute.flavors, flavor_ref)
-        fail(ActionFailed, 'Flavor not found') unless flavor
+        fail(ActionFailed, 'Flavor not found') unless flavor # rubocop:disable Metrics/LineLength, SignalException
         debug "Selected flavor: #{flavor.id} #{flavor.name}"
         flavor
       end
 
       def find_network(network_ref)
         net = find_matching(network.networks.all, network_ref)
-        fail(ActionFailed, 'Network not found') unless net
+        fail(ActionFailed, 'Network not found') unless net # rubocop:disable Metrics/LineLength, SignalException
         debug "Selected net: #{net.id} #{net.name}"
         net
       end
@@ -285,7 +281,7 @@ module Kitchen
             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}>"
+            fail ActionFailed, "No available IPs in pool <#{pool}>" # rubocop:disable Metrics/LineLength, SignalException
           end
           config[:floating_ip] = free_addrs[0]
           attach_ip(server, free_addrs[0])
@@ -336,7 +332,7 @@ module Kitchen
         pub, priv = parse_ips(pub, priv)
         pub[config[:public_ip_order].to_i] ||
           priv[config[:private_ip_order].to_i] ||
-          fail(ActionFailed, 'Could not find an IP')
+          fail(ActionFailed, 'Could not find an IP') # rubocop:disable Metrics/LineLength, SignalException
       end
 
       def parse_ips(pub, priv)
@@ -372,29 +368,6 @@ module Kitchen
         Ohai::Config[:hints_path][0]
       end
 
-      def setup_ssh(server, state)
-        if config[:key_name]
-          info "Using OpenStack keypair <#{config[:key_name]}>"
-        end
-        info "Using public SSH key <#{config[:public_key_path]}>"
-        info "Using private SSH key <#{config[:private_key_path]}>"
-        state[:ssh_key] = config[:private_key_path]
-        do_ssh_setup(state, config, server) unless config[:key_name]
-      end
-
-      def do_ssh_setup(state, config, server)
-        info "Setting up SSH access for key <#{config[:public_key_path]}>"
-        ssh = Fog::SSH.new(state[:hostname],
-                           config[:username],
-                           password: config[:password] || server.password)
-        pub_key = open(config[:public_key_path]).read
-        ssh.run([
-          %(mkdir .ssh),
-          %(echo "#{pub_key}" >> ~/.ssh/authorized_keys),
-          %(passwd -l #{config[:username]})
-        ])
-      end
-
       def disable_ssl_validation
         require 'excon'
         Excon.defaults[:ssl_verify_peer] = false

data/lib/kitchen/driver/openstack/volume.rb

@@ -64,7 +64,7 @@ module Kitchen
           @logger.debug "Waiting for volume to be ready for #{creation_timeout} seconds" # rubocop:disable Metrics/LineLength
           vol_model.wait_for(creation_timeout) do
             sleep(1)
-            fail('Failed to make volume') if status.downcase == 'error'
+            fail('Failed to make volume') if status.casecmp('error'.downcase).zero? # rubocop:disable Metrics/LineLength, SignalException
             ready?
           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, Chef Software Inc
+# Copyright (C) 2015-2016, 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 = '2.2.0'
+    OPENSTACK_VERSION = '3.0.0.pre.1'.freeze
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -70,7 +70,7 @@ describe Kitchen::Driver::Openstack do
     end
   end
 
-  describe '#initialize'do
+  describe '#initialize' do
     context 'default options' do
       it 'uses the normal SSH status check' do
         expect(driver[:no_ssh_tcp_check]).to eq(false)
@@ -120,11 +120,6 @@ describe Kitchen::Driver::Openstack do
         end
       end
 
-      it 'defaults to SSH with root user on port 22' do
-        expect(driver[:username]).to eq('root')
-        expect(driver[:port]).to eq('22')
-      end
-
       nils = [
         :server_name,
         :openstack_tenant,
@@ -741,7 +736,7 @@ describe Kitchen::Driver::Openstack do
       let(:hostname) { 'ab.c' * 20 }
 
       it 'limits the generated name to 63 characters' do
-        expect(driver.send(:default_name).length).to be <= (63)
+        expect(driver.send(:default_name).length).to be <= 63
       end
     end
 
@@ -799,7 +794,7 @@ describe Kitchen::Driver::Openstack do
 
       it 'limits the generated name to 63 characters' do
         expect(driver.send(:server_name_prefix, long_prefix).length)
-          .to be <= (63)
+          .to be <= 63
       end
     end
 
@@ -1114,83 +1109,6 @@ describe Kitchen::Driver::Openstack do
     end
   end
 
-  describe '#setup_ssh' do
-    let(:config) { { public_key_path: '/pub_key' } }
-    let(:config) do
-      {
-        public_key_path: '/pub_key',
-        key_name: 'OpenStackKey'
-      }
-    end
-
-    let(:server) { double(password: 'aloha') }
-    let(:state) { { hostname: 'host' } }
-    let(:read) { double(read: 'a_key') }
-    let(:ssh) { double(run: true) }
-
-    before(:each) do
-      allow(driver).to receive(:open).with(config[:public_key_path])
-        .and_return(read)
-    end
-
-    context 'sets the ssh_key state' do
-      before do
-        allow(driver).to receive(:bourne_shell?).and_return(false)
-        allow(driver).to receive(:do_ssh_setup).and_return(nil)
-      end
-
-      it 'does not execute the ssh setup' do
-        expect(driver).not_to receive(:do_ssh_setup)
-        driver.send(:setup_ssh, server, state)
-      end
-    end
-  end
-
-  describe '#do_ssh_setup' do
-    let(:config) { { public_key_path: '/pub_key' } }
-    let(:server) { double(password: 'aloha') }
-    let(:state) { { hostname: 'host' } }
-    let(:read) { double(read: 'a_key') }
-    let(:ssh) { double(run: true) }
-
-    before(:each) do
-      allow(driver).to receive(:open).with(config[:public_key_path])
-        .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',
-                                             password: 'aloha').and_return(ssh)
-      expect(ssh).to receive(:run).with([
-        'mkdir .ssh',
-        'echo "a_key" >> ~/.ssh/authorized_keys',
-        'passwd -l root'
-      ])
-      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
-
   describe '#add_ohai_hint' do
     let(:state) { { hostname: 'host' } }
     let(:ssh) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0.pre.1
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -105,16 +105,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.36'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.36'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -237,12 +237,12 @@ 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
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver