vagrant-mos 0.8.51 → 0.8.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86001b817c9718b21028e6730acf4e052f7cac7c
-  data.tar.gz: df9465395f4ade04622eaaed36b0bf4dac9fd938
+  metadata.gz: 36b4e3462904aee8e2fc8a3dd6f742ad1c8100f9
+  data.tar.gz: d227cc8c001846eef4c5f3d5df7043c2a54576fa
 SHA512:
-  metadata.gz: 3712be15ced27054a345de12153ff4adb9fbcc7400c88fed39343deb4100db79b87c24b8bb9a4b788ab0480bab1e5ac0f0a14ceecad6fac74c1bb836b9d03b59
-  data.tar.gz: d9fbf8bb233ce0707af978b14857f893f9bdbcab4c198beb21f5ffa0c03470b7ed89641c8852e15651cb63bb4e42a345ca66c23018992394472a9e0d6c7afe8c
+  metadata.gz: d29f70e17783f251af7d3ddc5baef0950249c710498b47eeb61f4e7afd02543e34d0a0878b1492c0d405a8cd7599c284829e5599c7a3517d7f3a412444d12505
+  data.tar.gz: 86d9b7a9fd6839d829a405517f082622a19ac3588c29b5588928519ec41d0a10f6ed422d11645371bfe1512f406ee521a05f52c49d7904729d63b5a1652632e1

data/lib/vagrant-mos/action/read_state.rb

@@ -36,7 +36,7 @@ module VagrantPlugins
           end
 
           # Return the state
-          puts server["status"]
+          # puts server["status"]
           return server["status"]
 
         end

data/lib/vagrant-mos/action/run_instance.rb

@@ -123,7 +123,7 @@ module VagrantPlugins
           rescue Fog::Compute::MOS::Error => e
             raise Errors::FogError, :message => e.message
           rescue Excon::Errors::HTTPStatusError => e
-            raise Errors::InternalFogError,
+            raise Errors::InternalMosError,
               :error => e.message,
               :response => e.response.body
 

data/lib/vagrant-mos/action/start_instance.rb

@@ -36,22 +36,27 @@ module VagrantPlugins
               tries = region_config.instance_ready_timeout / 2
 
               env[:ui].info(I18n.t("vagrant_mos.waiting_for_ready"))
-              #begin
-              #  retryable(:on => Fog::Errors::TimeoutError, :tries => tries) do
-              #    # If we're interrupted don't worry about waiting
-              #    next if env[:interrupted]
-              #
-              #    # Wait for the server to be ready
-              #    #server.wait_for(2) { ready? }
-              #  end
-              #rescue Fog::Errors::TimeoutError
-              #  # Notify the user
-              #  raise Errors::InstanceReadyTimeout,
-              #    timeout: region_config.instance_ready_timeout
-              #end
+              begin
+                retryable(:on => Errors::InstanceReadyTimeout, :tries => tries) do
+                  # If we're interrupted don't worry about waiting
+                  next if env[:interrupted]
+
+                  # Wait for the server to be ready
+                  #server.wait_for(2) { ready? }
+                  if(server["status"] == "running")
+                    break
+                  else
+                    sleep(2)
+                  end
+                end
+              rescue Errors::InstanceReadyTimeout
+                # Notify the user
+                raise Errors::InstanceReadyTimeout,
+                  timeout: region_config.instance_ready_timeout
+              end
             end
-          rescue Fog::Compute::MOS::Error => e
-            raise Errors::FogError, :message => e.message
+          rescue MOS::Error => e
+            raise Errors::MosError, :message => e.message
           end
 
           @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")

data/lib/vagrant-mos/errors.rb

@@ -7,12 +7,12 @@ module VagrantPlugins
         error_namespace("vagrant_mos.errors")
       end
 
-      class FogError < VagrantMOSError
-        error_key(:fog_error)
+      class MosError < VagrantMOSError
+        error_key(:mos_error)
       end
 
-      class InternalFogError < VagrantMOSError
-        error_key(:internal_fog_error)
+      class InternalMosError < VagrantMOSError
+        error_key(:internal_mos_error)
       end
 
       class InstanceReadyTimeout < VagrantMOSError

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.51'
+    VERSION = '0.8.52'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.51
+  version: 0.8.52
 platform: ruby
 authors:
 - yangcs2009