vagrant-mos 0.9.22 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e8c991547bfb7555e28e96c2e52528498c85e4
-  data.tar.gz: ec50bd104241ec26fe1f4ffddba38db553bdec16
+  metadata.gz: db7ff4eacde4cbb5229ac829e02010269eadcbdf
+  data.tar.gz: 3ad07e6f11dd8136e64cb96091628e587de03589
 SHA512:
-  metadata.gz: b1e0ea145f8ebb7ed9e3650b451be5892f4dcb01e676199dd034c223c146070613671064575a33128417b16bb6b094fe8f3f7f65d7016909ca73ec0e743311f5
-  data.tar.gz: 3694313d40e5bb402e48bd88d26e1d16612cf8c92cc83621ce7429a9188c93019da15f5ecf4d6fde0ea1ef3cda37ebd9de52213b8954a9d17a96faa8ab6ca226
+  metadata.gz: f6269d10fc10bf6378f2fcd0cf49ebab5adf25ad6367e80fb09a89ef03aa4ecb35c1b33e747b087fccb88d329459b5972566867c8521324e8c11593b0d5e2aac
+  data.tar.gz: db39fd83ab78a91065f997d3aee02f7f157b49e3693f98615c0f86e8e58bbe1e43c988bbed6606cf65cab016fa550c54af25523ae612af9fabe6e3fc62c44559

data/README.md

@@ -60,9 +60,9 @@ Vagrant.configure("2") do |config|
     mos.access_secret = "YOUR SECRET KEY"
     mos.access_url = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
-
     mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
-
+    mos.data_disk = 100
+    mos.band_with = 10
     override.ssh.username = "root"
     override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
   end
@@ -86,8 +86,10 @@ MOS provider设置了若干参数，主要参数说明如下：
 * `access_secret` - 访问美团云的secret
 * `access_url` -访问美团云的url
 * `region` - 创建主机的region，例如 "us-east-1"
-* `template_id` - 创建美团云主机的镜像，例如 "fa1026fe-c082-4ead-8458-802bf65ca64c"，用户可以使用`vagrant mos-templates`查看可以使用的镜像
-* `instance_ready_timeout` - 等待MOS主机创建成功最长时间，单位为秒。默认为120s。
+* `template_id` - 创建美团云主机的镜像，例如 "fa1026fe-c082-4ead-8458-802bf65ca64c"，用户可以使用`vagrant mos-templates`查看可以使用的镜像  
+* `data_disk` - 创建美团云主机的数据盘大小，单位为GB，例如100代表创建100G的数据盘  
+* `band_width` - 创建美团云主机的外网带宽大小，单位为Mbps，例如10代表选择10Mbps的外网带宽
+* `instance_ready_timeout` - 等待MOS主机创建成功最长时间，单位为秒。默认为120s
 * `instance_name` - 创建的MOS主机名称，例如 "ubuntu007"。
 * `instance_type` - 创建的MOS主机类型，例如"C1_M1". 默认配置为 "C1_M2".
 * `keypair_name` - 用户使用的秘钥名称。通过使用秘钥，用户登录该创建的主机时就不需要在输入繁琐的密码了

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

@@ -26,6 +26,8 @@ module VagrantPlugins
 
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)
+          data_disk = region_config.data_disk
+          band_width = region_config.band_width
           template_id = region_config.template_id
           name = region_config.name
           instance_type = region_config.instance_type
@@ -39,10 +41,11 @@ module VagrantPlugins
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_mos.launching_instance"))
-          env[:ui].info(" -- Name: #{name}") if name
-          env[:ui].info(" -- Type: #{instance_type}")
+          env[:ui].info(" -- Machine_name: #{name}") if name
+          env[:ui].info(" -- Instance_type: #{instance_type}")
           env[:ui].info(" -- Template_id: #{template_id}")
-          #env[:ui].info(" -- Region: #{region}")
+          env[:ui].info(" -- Data_disk: #{data_disk}")
+          env[:ui].info(" -- Band_width: #{band_width}")
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
           env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
 
@@ -50,13 +53,15 @@ module VagrantPlugins
               :flavor_id => instance_type,
               :name => name,
               :template_id => template_id,
+              :data_disk => data_disk,
+              :band_width => band_width,
               :key_name => keypair,
               :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
           }
 
           begin
             # create a handler to access MOS
-            server = env[:mos_compute].create_instance(options[:template_id], options[:flavor_id], nil, options[:name], options[:key_name], datadisk=9, bandwidth=2)
+            server = env[:mos_compute].create_instance(options[:template_id], options[:flavor_id], nil, options[:name], options[:key_name], options[:datadisk], options[:bandwidth])
           rescue Exception => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/config.rb

@@ -8,11 +8,21 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :access_key
 
-      # The ID of the image to use.
+      # The ID of the template to use.
       #
       # @return [String]
       attr_accessor :template_id
 
+      # The data_disk of the instance to create.
+      #
+      # @return [String]
+      attr_accessor :data_disk
+
+      # The band_width of the instance to create.
+      #
+      # @return [String]
+      attr_accessor :band_width
+
       # The name of the instance to create.
       #
       # @return [String]
@@ -75,16 +85,18 @@ module VagrantPlugins
       attr_accessor :ssh_host_attribute
 
       def initialize(region_specific=false)
-        @access_key             = UNSET_VALUE
-        @template_id                       = UNSET_VALUE
+        @access_key                = UNSET_VALUE
+        @template_id               = UNSET_VALUE
+        @data_disk                 = UNSET_VALUE
+        @band_width                = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
         @name                      = UNSET_VALUE
         @instance_type             = UNSET_VALUE
         @keypair_name              = UNSET_VALUE
         @region                    = UNSET_VALUE
         @version                   = UNSET_VALUE
-        @access_secret         = UNSET_VALUE
-        @access_url         = UNSET_VALUE
+        @access_secret             = UNSET_VALUE
+        @access_url                = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
         @terminate_on_shutdown     = UNSET_VALUE
         @ssh_host_attribute        = UNSET_VALUE
@@ -158,12 +170,18 @@ module VagrantPlugins
         # Try to get access keys from standard MOS environment variables; they
         # will default to nil if the environment variables are not present.
         @access_key     = ENV['MOS_ACCESS_KEY'] if @access_key     == UNSET_VALUE
-        @access_secret = ENV['MOS_SECRET_KEY'] if @access_secret == UNSET_VALUE
-        @access_url = ENV['MOS_SECRET_URL'] if @access_url == UNSET_VALUE
+        @access_secret  = ENV['MOS_SECRET_KEY'] if @access_secret  == UNSET_VALUE
+        @access_url     = ENV['MOS_SECRET_URL'] if @access_url     == UNSET_VALUE
 
         # Template_id must be nil, since we can't default that
         @template_id = nil if @template_id == UNSET_VALUE
 
+        # Default data_disk
+        @data_disk = 10 if @data_disk == UNSET_VALUE
+
+        # Default band_width
+        @band_width = 2 if @band_width == UNSET_VALUE
+
         # Default instance name is nil
         @name = nil if @name == UNSET_VALUE
 

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.22'
+    VERSION = '0.9.23'
   end
 end

data/spec/vagrant-mos/config_spec.rb

@@ -34,7 +34,7 @@ describe VagrantPlugins::MOS::Config do
     # simple boilerplate test, so I cut corners here. It just sets
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
-    [:access_key, :template_id, :instance_ready_timeout,:name,
+    [:access_key, :template_id, :data_disk, :band_width, :instance_ready_timeout, :name,
       :instance_type, :keypair_name, :ssh_host_attribute,
       :region, :access_secret, :access_url, :terminate_on_shutdown,
       :use_iam_profile].each do |attribute|

metadata

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