vagrant-mos 0.9.27 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69dfdf869d50ee3fdc0750f3ec2adf73158b6d48
-  data.tar.gz: 44b91937be73a62e8315f7d514899415a74c4f21
+  metadata.gz: 50438c454c86b6819ddb507eed8659d514b939b0
+  data.tar.gz: f0d9d722af20b7c269a1a3f03028b3d35464c302
 SHA512:
-  metadata.gz: 28d2d3ab07aeec2ae452a93e90b24c1391c5edece0867a37ec247775f0cceb72f2def6ab2ffbe5435aa75b41befe65551b6aa8837b845a3137ae4070b366e4bb
-  data.tar.gz: 0a1b58af1796cb11699670dfaf32ea713a31daad499ae566a6520f6301ea06f1b890e1a7555b0e47994430b71401ed7571d1c83f954cfb3fad88b7ef9eeb7810
+  metadata.gz: 014f8f91d0bb469b5f401a95fbaf918e4e790fe578a630146c49a727cb3544ae64684c7f7eeeb329dedf67cc392408ed7677e58a6ae2b92652b2403af5f0122b
+  data.tar.gz: 8ea015283ba929263aea470757be86ac58cb823f5553eff21f7b7466569042dcf44c0b620d9a2ac5250b5a8fd3ffc252655e1d6d16ce4f12b904002cd1249a3c

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

@@ -46,17 +46,16 @@ module VagrantPlugins
             env[:ui].info(I18n.t("vagrant_mos.packaging_instance", :instance_id => server["instanceId"]))
 
 
-            env[:mos_compute].create_template(server["instanceId"], "template_name", "template_notes")
+            result =env[:mos_compute].create_template(server["instanceId"], "template_name", "template_notes")
 
 
-=begin
 
 
             # Make the request to MOS to create an template from machine's instance
-            ami_response = server.service.create_image server.id, "#{server.tags["Name"]} Package - #{Time.now.strftime("%Y%m%d-%H%M%S")}", ""
+            #ami_response = server.service.create_image server.id, "#{server.tags["Name"]} Package - #{Time.now.strftime("%Y%m%d-%H%M%S")}", ""
 
             # Find ami id
-            @ami_id = ami_response.data[:body]["imageId"]
+           # @ami_id = ami_response.data[:body]["imageId"]
 
             # Attempt to burn the mos instance into an template within timeout
             env[:metrics]["instance_ready_time"] = Util::Timer.time do
@@ -66,18 +65,26 @@ module VagrantPlugins
               region_config = env[:machine].provider_config.get_region_config(region)
               tries = region_config.instance_package_timeout / 2
 
-              env[:ui].info(I18n.t("vagrant_mos.burning_ami", :ami_id => @ami_id))
+              #env[:ui].info(I18n.t("vagrant_mos.burning_ami", :ami_id => @ami_id))
 
               # Check the status of the template every 2 seconds until the ami burn timeout has been reached
               begin
-                retryable(:on => Fog::Errors::TimeoutError, :tries => tries) do
+                retryable(:on => Errors::TimeoutError, :tries => tries) do
                   # If we're interrupted don't worry about waiting
                   next if env[:interrupted]
 
                   # Need to update the ami_obj on each cycle
-                  ami_obj = server.service.images.get(@ami_id)
+                  #ami_obj = server.service.images.get(@ami_id)
 
                   # Wait for the server to be ready, raise error if timeout reached 
+                  if(result["return"] == "True")
+                    break
+                  else
+                    sleep(2)
+                  end
+
+
+=begin
                   server.wait_for(2) {
                     if ami_obj.state == "failed"
                       raise Errors::InstancePackageError,
@@ -89,16 +96,20 @@ module VagrantPlugins
                       ami_obj.ready?
                     end
                   }
+=end
                 end
-              rescue Fog::Errors::TimeoutError
+              rescue Errors::TimeoutError
                 # Notify the user upon timeout
                 raise Errors::InstancePackageTimeout,
                       timeout: region_config.instance_package_timeout
               end
             end
+
             env[:ui].info(I18n.t("vagrant_mos.packaging_instance_complete", :time_seconds => env[:metrics]["instance_ready_time"].to_i))
 
-=end
+
+
+
           rescue MOS::Error => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.27'
+    VERSION = '0.9.28'
   end
 end

data/locales/en.yml

@@ -10,6 +10,10 @@ en:
       This can sometimes result in not being able to access your instance.
     not_created: |-
       Instance is not created. Please run `vagrant up` first.
+    packaging_instance: |-
+      Burning instance %{instance_id} into a template
+    packaging_instance_complete: |-
+      Burn was successful in %{time_seconds}s
     ready: |-
       Machine is booted and ready for use!
     rsync_not_found_warning: |-

metadata

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