vagrant-openstack-cloud-provider 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0485390c70b7dfaeb04bfd416fecafb72e5d7d1
-  data.tar.gz: 0c9f67996fdcfb1ca5b13def83560b9d142b3a70
+  metadata.gz: 90a622141c798650755c827e3c69b274281ca800
+  data.tar.gz: 7199317a5e4268d3ccfc9eff91126f84edf3dd48
 SHA512:
-  metadata.gz: 15ebcaa621e8b1b07a955d3287e5bcb52844ac18110521a5c65c6ceac91b607d6738a4a4998bfde9f905173717daeae76fad1c16f6c5626256715f6e49020f25
-  data.tar.gz: 83f140f1a941a0547ba18c1f5c3bce7581ec6ab51e21e9f8294c5ccd25c92d5a0035d8e5bbf8cffee62601b1852656afa132793aee0dc0133c9f6ed3314240cd
+  metadata.gz: b3b8ab12b361550eec73e978b4177572ed6f0fa913ee13ea5dea7e0cfb335cc4a6d099342b77536af29635acee728547c948c48582f75edbda6fa3f9b20f74ae
+  data.tar.gz: 4379ae1060288ba27cee8e29fc412f59b7f60e24667196df3c88b7f97dd4d82412ad87aa4adb00ed41045919f75c09a94afba06adcbd50e8aabf462f3e45bb50

data/lib/vagrant-openstack-cloud-provider/action/create_server.rb

@@ -156,9 +156,12 @@ module VagrantPlugins
                end
                sleep sleep_interval
              end
-             raise unless env[:machine].communicate.ready?
-           rescue
-             raise Errors::SshUnavailable
+             unless env[:machine].communicate.ready?
+                raise Errors::SshWaitTimeout.new(
+                    :seconds => sleep_interval * (timeout / sleep_interval))
+             end
+           rescue Exception => msg
+             raise Errors::SshUnavailable.new(:error => msg)
            end
         end
 

data/lib/vagrant-openstack-cloud-provider/errors.rb

@@ -11,6 +11,10 @@ module VagrantPlugins
         error_key(:create_bad_state)
       end
 
+      class SshWaitTimeout < VagrantOpenStackError
+        error_key(:ssh_wait_timeout)
+      end
+
       class SshUnavailable < VagrantOpenStackError
         error_key(:ssh_unavailable)
       end

data/lib/vagrant-openstack-cloud-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "1.1.10"
+    VERSION = "1.1.11"
   end
 end

data/locales/en.yml

@@ -37,9 +37,10 @@ en:
         state: '%{state}', instead of properly booting. Run `vagrant status`
         to find out what can be done about this state, or `vagrant destroy`
         if you want to start over.
+      ssh_wait_timeout: |-
+        The server is not ready for SSH communication after %{seconds} seconds.
       ssh_unavailable: |-
-        The server has been created successfully but it refuses incomming
-        ssh connections.
+        The server's SSH failed to become available because: %{error}.
       no_matching_flavor: |-
         No matching flavor was found! Please check your flavor setting
         to make sure you have a valid flavor chosen.

data/spec/vagrant-openstack-cloud-provider/action/create_server_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 require 'vagrant-openstack-cloud-provider/errors'
 require 'vagrant-openstack-cloud-provider/action/create_server'
 
+I18n.load_path << File.expand_path("locales/en.yml", Pathname.new(File.expand_path("../../../../", __FILE__)))
+I18n.reload!
+
 RSpec.describe VagrantPlugins::OpenStack::Action::CreateServer do
   describe '#server_to_be_available?' do
     subject {
@@ -45,7 +48,23 @@ RSpec.describe VagrantPlugins::OpenStack::Action::CreateServer do
       expect(machine).to receive(:communicate).at_least(:once).and_return(communicate)
 
       env = { :ui => ui, :interrupted => false, :machine => machine }
-      expect { subject.send('ssh_is_responding?', env, timeout=0.005, sleep_interval=0.001) }.to raise_error(VagrantPlugins::OpenStack::Errors::SshUnavailable)
+      expect { subject.send('ssh_is_responding?', env, timeout=0.005, sleep_interval=0.001) }.
+          to raise_error(VagrantPlugins::OpenStack::Errors::SshUnavailable).
+              with_message(I18n.t('vagrant_openstack.errors.ssh_unavailable',
+                                  :error => I18n.t('vagrant_openstack.errors.ssh_wait_timeout',
+                                                   :seconds => 0.005)))
+    end
+
+    it 'should show any error raised' do
+      expect(ui).to receive(:info).at_least(:once)
+      expect(communicate).to receive(:ready?).once.and_raise(Exception.new("waaaat"))
+      expect(machine).to receive(:communicate).at_least(:once).and_return(communicate)
+
+      env = { :ui => ui, :interrupted => false, :machine => machine }
+      expect { subject.send('ssh_is_responding?', env, timeout=0.005, sleep_interval=0.001) }.
+          to raise_error(VagrantPlugins::OpenStack::Errors::SshUnavailable).
+              with_message(I18n.t('vagrant_openstack.errors.ssh_unavailable',
+                                  :error => 'waaaat'))
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-cloud-provider
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Mathieu Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog