kitchen-openstack 1.8.1 → 1.9.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6b914b94611866e422dabc3cf49b12b27a669e
-  data.tar.gz: 8afa9715342e7030ef1ff79502f52ee903093380
+  metadata.gz: 7d16c235a1abe82961c4184bf0e91329fc09257e
+  data.tar.gz: 7d4dabf334f8c74f5101e8aae6514734fc33ccc3
 SHA512:
-  metadata.gz: 50a5e198899b658931381439aace29a5f745c64e76ffe9e9db64a227aac60157fe1fd3836b956f09eda16f471b4b8f72662e93b27ad64f9db642896bc8c981a9
-  data.tar.gz: 31181fa626deffd2467bcf84ebb5e49b1545d70169feebd9687f99000494457268af995964116e5bfac1921b559010136a6ec3364b4a52d04e4a2d02516d4a9d
+  metadata.gz: f671a2b04efe4191d91dcc92f9639cb736e02d5207afd8d2ef5e3f3f00573e97f9024ccf4f5e4e2f08f4147f3a211e175378cac7d8c415b346af04b6f730a853
+  data.tar.gz: e294a4581e4d42042856e147546739ada5f3510b34b861da514f50d784c5866637ba6107b387f9b10218af12360592fc7c5e0a289c83e263529a1ec9be1c364b

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# ?.?.? / ????-??-??
+
 # 1.8.1 / 2015-07-22
 
 ### Bug Fixes

data/README.md

@@ -105,6 +105,28 @@ Test Kitchen's SSH calls to the node.
     floating_ip: [A SPECIFIC FLOATING IP TO ASSIGN]
     floating_ip_pool: [AN OPENSTACK POOL NAME TO ASSIGN THE NEXT IP FROM]
 
+In some complex network scenarios you can have several IP addresses designated
+as public or private. Use `public_ip_order` or `private_ip_order` to control
+which one to use for further SSH connection. Default is 0 (first one)
+
+For example if you have openstack istance that has network with several IPs assigned like
+
+```
++--------------------------------------+------------+--------+------------+-------------+----------------------------------+
+| ID                                   | Name       | Status | Task State | Power State | Networks                         |
++--------------------------------------+------------+--------+------------+-------------+----------------------------------+
+| 31c98de4-026f-4d12-b03f-a8a35c6e730b | kitchen    | ACTIVE | None       | Running     | test=10.0.0.1, 10.0.1.1   |
+
+```
+
+to use second `10.0.1.1` IP address you need to specify
+
+```yaml
+  private_ip_order: 1
+
+```
+assuming that test network is configured as private.
+
 The `network_ref` option can be specified as an exact id, an exact name,
 or as a regular expression matching the name of the network. You can pass one
 

data/Rakefile

@@ -1,6 +1,7 @@
 # Encoding: UTF-8
 
 require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
 require 'cane/rake_task'
 require 'rspec/core/rake_task'
@@ -17,4 +18,4 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:cane, :rubocop, :loc, :spec]
+task default: [:rubocop, :loc, :spec]

data/lib/kitchen/driver/openstack.rb

@@ -1,4 +1,4 @@
-# Encoding: UTF-8
+# Encoding: utf-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -30,7 +30,7 @@ module Kitchen
     # Openstack driver for Kitchen.
     #
     # @author Jonathan Hartman <j@p4nt5.com>
-    class Openstack < Kitchen::Driver::SSHBase
+    class Openstack < Kitchen::Driver::SSHBase # rubocop:disable Metrics/ClassLength, Metrics/LineLength
       @@ip_pool_lock = Mutex.new
 
       default_config :server_name, nil
@@ -55,6 +55,8 @@ module Kitchen
       default_config :openstack_network_name, nil
       default_config :floating_ip_pool, nil
       default_config :floating_ip, nil
+      default_config :private_ip_order, 0
+      default_config :public_ip_order, 0
       default_config :availability_zone, nil
       default_config :security_groups, nil
       default_config :network_ref, nil
@@ -96,6 +98,7 @@ module Kitchen
         end
         state[:hostname] = get_ip(server)
         setup_ssh(server, state)
+        wait_for_ssh_key_access(state)
         add_ohai_hint(state)
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
@@ -114,6 +117,25 @@ module Kitchen
 
       private
 
+      def wait_for_ssh_key_access(state)
+        new_state = build_ssh_args(state)
+        new_state[2][:number_of_password_prompts] = 0
+        info 'Checking ssh key authentication'
+        30.times do
+          ssh = Fog::SSH.new(*new_state)
+          begin
+            ssh.run([%(uname -a)])
+          rescue => e
+            info "Server not yet accepting SSH key: #{e.message}"
+            sleep 1
+          else
+            info 'SSH key authetication successful'
+            return
+          end
+        end
+        fail "30 seconds went by and we couldn't connect, somethings broken"
+      end
+
       def openstack_server
         server_def = {
           provider: 'OpenStack'
@@ -305,7 +327,9 @@ module Kitchen
         pub, priv = get_public_private_ips(server)
         priv ||= server.ip_addresses unless pub
         pub, priv = parse_ips(pub, priv)
-        pub.first || priv.first || fail(ActionFailed, 'Could not find an IP')
+        pub[config[:public_ip_order].to_i] ||
+          priv[config[:private_ip_order].to_i] ||
+          fail(ActionFailed, 'Could not find an IP')
       end
 
       def parse_ips(pub, priv)

data/lib/kitchen/driver/openstack_version.rb

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

data/spec/kitchen/driver/openstack_spec.rb

@@ -196,35 +196,6 @@ describe Kitchen::Driver::Openstack do
           openstack_tenant: 'www'
         }
       end
-
-      it 'generates a server name in the absence of one' do
-        driver.create(state)
-        expect(driver[:server_name]).to eq('a_monkey!')
-      end
-
-      it 'gets a proper server ID' do
-        driver.create(state)
-        expect(state[:server_id]).to eq('test123')
-      end
-
-      it 'gets a proper hostname (IP)' do
-        driver.create(state)
-        expect(state[:hostname]).to eq('1.2.3.4')
-      end
-
-      it 'does not disable SSL validation' do
-        expect(driver).to_not receive(:disable_ssl_validation)
-        driver.create(state)
-      end
-    end
-
-    context 'SSL validation disabled' do
-      let(:config) { { disable_ssl_validation: true } }
-
-      it 'disables SSL cert validation' do
-        expect(driver).to receive(:disable_ssl_validation)
-        driver.create(state)
-      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0.dev
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -230,12 +230,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver
@@ -243,4 +243,3 @@ test_files:
 - spec/kitchen/driver/openstack/volume_spec.rb
 - spec/kitchen/driver/openstack_spec.rb
 - spec/spec_helper.rb
-has_rdoc: