vagrant-mos 0.9.24 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb943e2fe26ba7b745aa95fd16b2c5252d46050
-  data.tar.gz: a7b9148932b560e9751db3ce0b0c45dcb7c601f4
+  metadata.gz: 57be0c6f5eff6eefeb4afd72af71c74a7e6fc461
+  data.tar.gz: 300d5ec646c56cca793c29aea0eccc2f4ea85cae
 SHA512:
-  metadata.gz: 2d98de545c48cd1b20634fd016f4c9641bc75c284019d6151e316876b2765192d4f638d105a5c81d7474b3e426a552548b7bffad5711ca2313ddab905ce413dc
-  data.tar.gz: f57b7334609697ecdba75fd7267e168cbc369e69435c77a36066a292a75089d702b4db020090fb8d339442e7c28ec8e9996a7784f8c85abed780699e41e7f66f
+  metadata.gz: f9551652c353461ca1fa4ebcbb753e3747a69909081490d658fe6ea6f366ad20dbf86788a46cb77aaec31ddd012495698231dc5c008bc12e0071d81b5167843a
+  data.tar.gz: 2dc8807b52aa2ef982a299026fb6df6aadfb13667c8de4bc5b01a45f1e85bcf4cc1a58b6a591f2ea3659f71625bd709e71703cbffefb6671442c103c17d671e7

data/README.md

@@ -90,6 +90,7 @@ MOS provider设置了若干参数，主要参数说明如下：
 * `data_disk` - 创建美团云主机的数据盘大小，单位为GB，例如100代表创建100G的数据盘  
 * `band_width` - 创建美团云主机的外网带宽大小，单位为Mbps，例如10代表选择10Mbps的外网带宽
 * `instance_ready_timeout` - 等待MOS主机创建成功最长时间，单位为秒。默认为120s
+* `instance_package_timeout` - 等待模板创建成功最长时间，单位为秒。默认为600s
 * `instance_name` - 创建的MOS主机名称，例如 "ubuntu007"。
 * `instance_type` - 创建的MOS主机类型，例如"C1_M1". 默认配置为 "C1_M2".
 * `keypair_name` - 用户使用的秘钥名称。通过使用秘钥，用户登录该创建的主机时就不需要在输入繁琐的密码了

data/lib/vagrant-mos/action.rb

@@ -8,6 +8,21 @@ module VagrantPlugins
       # Include the built-in modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
 
+      def self.action_package
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            # Connect to MOS and then Create a package from the server instance
+            b2.use ConnectMOS
+            b2.use PackageInstance
+          end
+        end
+      end
+
       # This action is called to halt the remote machine.
       def self.action_halt
         Vagrant::Action::Builder.new.tap do |b|
@@ -188,6 +203,7 @@ module VagrantPlugins
       autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
       autoload :WaitForState, action_root.join("wait_for_state")
       autoload :WarnNetworks, action_root.join("warn_networks")
+      autoload :PackageInstance, action_root.join("package_instance")
     end
   end
 end

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

@@ -0,0 +1,204 @@
+require "log4r"
+require 'vagrant/util/template_renderer'
+require 'vagrant-mos/util/timer'
+require 'vagrant/action/general/package'
+
+module VagrantPlugins
+  module MOS
+    module Action
+      # This action packages a running mos-based server into an
+      # mos-based vagrant box. It does so by burning the associated
+      # vagrant-mos server instance, into an template via fog. Upon
+      # successful template burning, the action will create a .box tarball
+      # writing a Vagrantfile with the fresh template id into it.
+
+      # Vagrant itself comes with a general package action, which 
+      # this plugin action does call. The general action provides
+      # the actual packaging as well as other options such as
+      # --include for including additional files and --vagrantfile
+      # which is pretty much not useful here anyway.
+
+      # The virtualbox package plugin action was loosely used
+      # as a model for this class.
+
+      class PackageInstance < Vagrant::Action::General::Package
+        include Vagrant::Util::Retryable
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant_mos::action::package_instance")
+          env["package.include"] ||= []
+          env["package.output"] ||= "package.box"
+        end
+
+        alias_method :general_call, :call
+
+        def call(env)
+          # Initialize metrics if they haven't been
+          env[:metrics] ||= {}
+
+          # This block attempts to burn the server instance into an template
+          begin
+            # Get the server object for given machine
+            #server = env[:mos_compute].servers.get(env[:machine].id)
+            server = (env[:mos_compute].describe_instances([env[:machine].id]))["Instance"]
+
+            env[:ui].info(I18n.t("vagrant_mos.packaging_instance", :instance_id => server["instanceId"]))
+
+
+            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")}", ""
+
+            # Find ami id
+            @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
+
+              # Get the config, to set the ami burn timeout
+              region = env[:machine].provider_config.region
+              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))
+
+              # 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
+                  # 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)
+
+                  # Wait for the server to be ready, raise error if timeout reached 
+                  server.wait_for(2) {
+                    if ami_obj.state == "failed"
+                      raise Errors::InstancePackageError,
+                            ami_id: ami_obj.id,
+                            err: ami_obj.state
+                      return
+                    else
+                      # Successful template burn will result in true here
+                      ami_obj.ready?
+                    end
+                  }
+                end
+              rescue Fog::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
+
+          # Handles inclusions from --include and --vagrantfile options
+          setup_package_files(env)
+
+          # Setup the temporary directory for the tarball files
+          @temp_dir = env[:tmp_path].join(Time.now.to_i.to_s)
+          env["export.temp_dir"] = @temp_dir
+          FileUtils.mkpath(env["export.temp_dir"])
+
+          # Create the Vagrantfile and metadata.json files from templates to go in the box
+          create_vagrantfile(env)
+          create_metadata_file(env)
+
+          # Just match up a couple environmental variables so that
+          # the superclass will do the right thing. Then, call the
+          # superclass to actually create the tarball (.box file)
+          env["package.directory"] = env["export.temp_dir"]
+          general_call(env)
+
+          # Always call recover to clean up the temp dir
+          clean_temp_dir
+        end
+
+        protected
+
+        # Cleanup temp dir and files
+        def clean_temp_dir
+          if @temp_dir && File.exist?(@temp_dir)
+            FileUtils.rm_rf(@temp_dir)
+          end
+        end
+
+        # This method generates the Vagrantfile at the root of the box. Taken from 
+        # VagrantPlugins::ProviderVirtualBox::Action::PackageVagrantfile
+        def create_vagrantfile env
+          File.open(File.join(env["export.temp_dir"], "Vagrantfile"), "w") do |f|
+            f.write(TemplateRenderer.render("vagrant-mos_package_Vagrantfile", {
+                region: env[:machine].provider_config.region,
+                ami: @ami_id,
+                template_root: template_root
+            }))
+          end
+        end
+
+        # This method generates the metadata.json file at the root of the box.
+        def create_metadata_file env
+          File.open(File.join(env["export.temp_dir"], "metadata.json"), "w") do |f|
+            f.write(TemplateRenderer.render("metadata.json", {
+                template_root: template_root
+            }))
+          end
+        end
+
+        # Sets up --include and --vagrantfile files which may be added as optional
+        # parameters. Taken from VagrantPlugins::ProviderVirtualBox::Action::SetupPackageFiles
+        def setup_package_files(env)
+          files = {}
+          env["package.include"].each do |file|
+            source = Pathname.new(file)
+            dest = nil
+
+            # If the source is relative then we add the file as-is to the include
+            # directory. Otherwise, we copy only the file into the root of the
+            # include directory. Kind of strange, but seems to match what people
+            # expect based on history.
+            if source.relative?
+              dest = source
+            else
+              dest = source.basename
+            end
+
+            # Assign the mapping
+            files[file] = dest
+          end
+
+          if env["package.vagrantfile"]
+            # Vagrantfiles are treated special and mapped to a specific file
+            files[env["package.vagrantfile"]] = "_Vagrantfile"
+          end
+
+          # Verify the mapping
+          files.each do |from, _|
+            raise Vagrant::Errors::PackageIncludeMissing,
+                  file: from if !File.exist?(from)
+          end
+
+          # Save the mapping
+          env["package.files"] = files
+        end
+
+        # Used to find the base location of mos-vagrant templates
+        def template_root
+          MOS.source_root.join("templates")
+        end
+
+
+      end
+    end
+  end
+end

data/lib/vagrant-mos/config.rb

@@ -28,6 +28,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :name
 
+      # The timeout to wait for an instance to successfully burn into an template.
+      #
+      # @return [Fixnum]
+      attr_accessor :instance_package_timeout
+
       # The timeout to wait for an instance to become ready.
       #
       # @return [Fixnum]
@@ -85,6 +90,7 @@ module VagrantPlugins
         @data_disk                 = UNSET_VALUE
         @band_width                = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
+        @instance_package_timeout  = UNSET_VALUE
         @name                      = UNSET_VALUE
         @instance_type             = UNSET_VALUE
         @keypair_name              = UNSET_VALUE
@@ -182,7 +188,8 @@ module VagrantPlugins
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 
-
+        # Set the default timeout for waiting for an instance to burn into a template
+        @instance_package_timeout = 600 if @instance_package_timeout == UNSET_VALUE
         # Default instance type is an C1_M2
         @instance_type = "C1_M2" if @instance_type == UNSET_VALUE
         # Keypair defaults to nil

data/lib/vagrant-mos/errors.rb

@@ -19,6 +19,14 @@ module VagrantPlugins
         error_key(:instance_ready_timeout)
       end
 
+      class InstancePackageError < VagrantMOSError
+        error_key(:instance_package_error)
+      end
+
+      class InstancePackageTimeout < VagrantMOSError
+        error_key(:instance_package_timeout)
+      end
+
       class RsyncError < VagrantMOSError
         error_key(:rsync_error)
       end

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.24'
+    VERSION = '0.9.26'
   end
 end

data/locales/en.yml

@@ -69,6 +69,18 @@ en:
         set waiting for the instance to become ready is %{timeout} seconds.
         Please verify that the machine properly boots. If you need more time
         set the `instance_ready_timeout` configuration on the MOS provider.
+
+      instance_package_error: |-
+        There was an error packaging the instance. See details below for more info.
+
+        Template Id: %{template_id}
+        Error: %{err}
+      instance_package_timeout: |-
+        The Template failed to become "ready" in MOS. The timeout currently
+        set waiting for the instance to become ready is %{timeout} seconds. For
+        larger instances Template burning may take long periods of time. Please
+        ensure the timeout is set high enough, it can be changed by adjusting
+        the `instance_package_timeout` configuration on the MOS provider.
       rsync_error: |-
         There was an error when attempting to rsync a shared folder.
         Please inspect the error message below for more info.

data/spec/vagrant-mos/config_spec.rb

@@ -18,6 +18,7 @@ describe VagrantPlugins::MOS::Config do
     its("access_key")     { should be_nil }
     its("template_id")               { should be_nil }
     its("instance_ready_timeout") { should == 120 }
+    its("instance_package_timeout") { should == 600 }
     its("name")     { should be_nil }
     its("instance_type")     { should == "C1_M2" }
     its("keypair_name")      { should be_nil }
@@ -34,7 +35,7 @@ describe VagrantPlugins::MOS::Config do
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
     [:access_key, :template_id, :data_disk, :band_width, :instance_ready_timeout, :name,
-      :instance_type, :keypair_name, :ssh_host_attribute,
+     :instance_package_timeout, :instance_type, :keypair_name, :ssh_host_attribute,
       :region, :access_secret, :access_url,
       :use_iam_profile].each do |attribute|
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.26
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mos-sdk
@@ -103,6 +103,7 @@ files:
 - lib/vagrant-mos/action/message_already_created.rb
 - lib/vagrant-mos/action/message_not_created.rb
 - lib/vagrant-mos/action/message_will_not_destroy.rb
+- lib/vagrant-mos/action/package_instance.rb
 - lib/vagrant-mos/action/read_ssh_info.rb
 - lib/vagrant-mos/action/read_state.rb
 - lib/vagrant-mos/action/run_instance.rb