kitchen-openstack 2.0.0.dev → 2.0.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fcef6ed3a8627a5040fdd71bce12e068ea0fe2
-  data.tar.gz: b1325ba7444d75a0e88db8a2e3429e9f4d3514f6
+  metadata.gz: acd555f1b4b006c17ea0030ccee6c4da9dceb13e
+  data.tar.gz: d6468aa93803c937b0dc5aed9c049953e1ee377b
 SHA512:
-  metadata.gz: 7d89d7bc5d23ddb2617be2e43671d405282531891b2c6a63e70d3993681e301e3f0f46bac27f61cb5feffbd29ab095267240fb7f9c1a01e3b700583c4bb56bca
-  data.tar.gz: d5592746386dde26f22029973d9594407e764894331d3d66f9ec3b00060c2e4eefbbc633cc39094978ce4b5df41446062fd82326a06f14c41d02e68f9063612d
+  metadata.gz: a5461211b6a784b0bb47d408c792d9a30ada1e975fe32db3e9eba608e740e37410323135be7726e77e18e8b36082382324cd353d2fdb2f79da8fdc43ca074261
+  data.tar.gz: 0cbf940c21cf605b92ad2d4d4340da935a9a17ac724339322a7f731a67f80f9e1bd9683bc36a082183ce3a1b4331b1e1ae9559adf108ca67d879c957bbac958f

data/lib/kitchen/driver/openstack.rb

@@ -61,7 +61,7 @@ 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, 0
+      default_config :winrm_wait, nil
       default_config :block_device_mapping, nil
 
       required_config :private_key_path
@@ -341,7 +341,6 @@ module Kitchen
       end
 
       def setup_ssh(server, state)
-        tcp_check(state)
         if config[:key_name]
           info "Using OpenStack keypair <#{config[:key_name]}>"
         end
@@ -364,19 +363,6 @@ module Kitchen
         ])
       end
 
-      def tcp_check(state)
-        # allow driver config to bypass SSH tcp check -- because
-        # it doesn't respect ssh_config values that might be required
-        if config[:no_ssh_tcp_check]
-          sleep(config[:no_ssh_tcp_check_sleep])
-        else
-          wait_for_sshd(state[:hostname],
-                        config[:username],
-                        port: config[:port])
-        end
-        info "Server #{state[:hostname]} has ssh ready..."
-      end
-
       def disable_ssl_validation
         require 'excon'
         Excon.defaults[:ssl_verify_peer] = false

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.dev'
+    OPENSTACK_VERSION = '2.0.0.dev.1'
   end
 end

data/spec/kitchen/driver/openstack_spec.rb

@@ -196,6 +196,7 @@ describe Kitchen::Driver::Openstack do
       allow(d).to receive(:add_ohai_hint).and_return(true)
       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
       d
     end
 
@@ -1104,43 +1105,6 @@ describe Kitchen::Driver::Openstack do
     end
   end
 
-  describe '#setup_ssh' do
-    let(:server) { double }
-    before(:each) do
-      [:tcp_check, :do_ssh_setup].each do |m|
-        allow_any_instance_of(described_class).to receive(m)
-      end
-    end
-
-    it 'calls the TCP check' do
-      expect_any_instance_of(described_class).to receive(:tcp_check).with(state)
-      driver.send(:setup_ssh, server, state)
-    end
-  end
-
-  describe '#tcp_check' do
-    let(:state) { { hostname: 'hostname' } }
-
-    context 'standard SSH check' do
-      it 'calls the normal Kitchen SSH wait' do
-        expect_any_instance_of(described_class).not_to receive(:sleep)
-        expect_any_instance_of(described_class).to receive(:wait_for_sshd)
-          .with('hostname', 'root', port: '22')
-        driver.send(:tcp_check, state)
-      end
-    end
-
-    context 'override SSH wait' do
-      let(:config) { { no_ssh_tcp_check: true } }
-
-      it 'sleeps instead of monitoring the SSH port' do
-        expect_any_instance_of(described_class).not_to receive(:wait_for_sshd)
-        expect_any_instance_of(described_class).to receive(:sleep).with(120)
-        driver.send(:tcp_check, state)
-      end
-    end
-  end
-
   describe '#disable_ssl_validation' do
     it 'turns off Excon SSL cert validation' do
       expect(driver.send(:disable_ssl_validation)).to eq(false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 2.0.0.dev
+  version: 2.0.0.dev.1
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen