vagrant-mos 0.9.18 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784f71fc016d8c9be71b9c2c5522708542f95065
-  data.tar.gz: 09aafe282fde376e8cceb5b30b5b2aea101fef5f
+  metadata.gz: 9bae12df04b93f0f02bdae078f6d1f10760f4933
+  data.tar.gz: e92c667ebe41e4d81e39e4c85db93d51f71409a3
 SHA512:
-  metadata.gz: 02a4459b70ddaa33e2e27f26c11d16e096fdbbc405fe5ec96bed03a6294a5868ccb1aa8610f73c2a5c8405ecc7b0f77aa0fa40c487c683d43d4ae953817b7198
-  data.tar.gz: 088eb638e34750542c8c72ce432f9568afd1ffefbce83721283de21019d92864640ab8312bdb894abb48d9b308660441ee03a6c200445bc02fd369256b8a40fb
+  metadata.gz: a24f9f4a9ee686d2879bb96db22c813cc169405cd83497dee46be0b54de6cf30a70e6bd27eee6de9f9251063f523ce4253d387671347e74a3e3820bbf21ca5c8
+  data.tar.gz: 97a607b2d35f4786f88e6fcfc1fc816414d90ba5059f60818083a1f89ec12c642981b98767271129410a97b820d5b56c2dd1f1692ae1ac3e7de304f5512f05ba

data/README.md

@@ -8,25 +8,23 @@
 [gem]: https://rubygems.org/gems/vagrant-mos
 [gemnasium]: https://gemnasium.com/mitchellh/vagrant-mos
 
-This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [MOS](http://cloud.sankuai.com/)
-provider to Vagrant, allowing Vagrant to control and provision machines in
-MOS.
+该版本的[Vagrant](http://www.vagrantup.com) 1.2+ plugin现在支持[MOS](http://cloud.sankuai.com/)
+provider，从而使得Vagrant可以像管理VirtualBox那样管理美团云主机。
 
-**NOTE:** This plugin requires Vagrant 1.2+,
+**NOTE:** 该版本的plugin要求Vagrant版本为 1.2+,而且最好是最新版本
 
-## Features
+## 主要功能
 
-* Boot MOS instances.
-* SSH into the instances.
-* Provision the instances with any built-in Vagrant provisioner.
-* Minimal synced folder support via `rsync`.
-* Manage MOS machine's status through `vagrant status`.  
+* 支持Vagrant常用命令 `up`, `status`, `destroy`, `halt`, `reload` 以及 `ssh` 
+* 创建 MOS 主机实例
+* SSH连接已创建的主机
+* 支持通过`rsync`命令同步文件夹
+* 通过`vagrant status`命令管理已创建的MOS主机
+* 通过`vagrant mos-templates`查看可使用的镜像.  
   
-## Usage
+## 安装使用
 
-Install using standard Vagrant 1.2+ plugin installation methods. After
-installing, `vagrant up` and specify the `mos` provider. An example is
-shown below.
+按照安装Vagrant 1.2+ plugin的标准步骤安装即可。**在完成plugin以及MOS box安装后**，通过`vagrant up` 即可创建Vagrant MOS主机实例。下面是样例。
 
 ```
 $ vagrant plugin install vagrant-mos
@@ -35,23 +33,23 @@ $ vagrant up --provider=mos
 ...
 ```
 
-Of course prior to doing this, you'll need to obtain an MOS-compatible
-box file for Vagrant.
+## 快速入门
 
-## Quick Start
-
-After installing the plugin (instructions above), the quickest way to get
-started is to actually use a MOS box and specify all the details
-manually within a `config.vm.provider` block. So first, add the 
-box using any name you want:
+在按照上述步骤完成vagrant plugin安装后，要想快速使用vagrant MOS创建主机，首先要有MOS box。用户可以执行下面的命令安装MOS box。
 
 ```
 $ vagrant box add mos_box https://github.com/yangcs2009/vagrant-mos/raw/master/mos.box
 ...
 ```
 
-And then make a Vagrantfile that looks like the following, filling in
-your information where necessary.
+完成以上工作后，就可以开始创建MOS主机了，首先创建一个工作目录，然后创建一份Vagrant配置文档。
+
+```
+$ mkdir vagrant_workplace
+$ cd vagrant_workplace
+$ vagrant init
+```
+然后就会发现在该目录下新生成一个Vagrantfile文档，编辑该文档如下：
 
 ```
 Vagrant.configure("2") do |config|
@@ -63,7 +61,7 @@ Vagrant.configure("2") do |config|
     mos.secret_access_url = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
 
-    mos.ami = "fa1026fe-c082-4ead-8458-802bf65ca64c"
+    mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
 
     override.ssh.username = "root"
     override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
@@ -71,53 +69,33 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-And then run `vagrant up --provider=mos`.
-
-This will start an Ubuntu 12.04 instance in the us-east-1 region within
-your account. And assuming your SSH information was filled in properly
-within your Vagrantfile, SSH and provisioning will work as well.
+完成后保存，然后执行 `vagrant up --provider=mos`就可以创建MOS主机了。
 
-Note that normally a lot of this boilerplate is encoded within the box
-file, but the box file used for the quick start, the "dummy" box, has
-no preconfigured defaults.
+当然这一切都是假定你的ssh配置信息已经完成，如何设置ssh信息请参见[美团云秘钥](http://cloud.sankuai.com/console/#keypairs)。
 
-If you have issues with SSH connecting, make sure that the instances
-are being launched with a security group that allows SSH access.
+## Box设置
 
-## Box Format
+不同的vagrant provider都必须使用符合响应要求的box来创建新主机。我们样例采用的是MOS的box `mos`。用户可以查看[example_box](https://github.com/yangcs2009/vagrant-mos/tree/master/example_box)，从中还可以学习如何设置自己的boxes。
 
-Every provider in Vagrant must introduce a custom box format. This
-provider introduces `mos` boxes. You can view an example box in
-the [example_box/ directory](https://github.com/mitchellh/vagrant-mos/tree/master/example_box).
-That directory also contains instructions on how to build a box.
 
-The box format is basically just the required `metadata.json` file
-along with a `Vagrantfile` that does default settings for the
-provider-specific configuration for this provider.
+## 配置文档
 
-## Configuration
+MOS provider设置了若干参数，主要参数说明如下：
 
-This provider exposes quite a few provider-specific configuration options:
+* `access_key_id` - 访问美团云的key
+* `secret_access_key` - 访问美团云的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。
+* `instance_name` - 创建的MOS主机名称，例如 "ubuntu007"。
+* `instance_type` - 创建的MOS主机类型，例如"C1_M1". 默认配置为 "C1_M2".
+* `keypair_name` - 用户使用的秘钥名称。通过使用秘钥，用户登录该创建的主机时就不需要在输入繁琐的密码了
+* `use_iam_profile` - 如果该参数设置，则使用[IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)认证。
 
-* `access_key_id` - The access key for accessing MOS
-* `ami` - The image id to boot, such as "fa1026fe-c082-4ead-8458-802bf65ca64c"
-* `instance_ready_timeout` - The number of seconds to wait for the instance
-  to become "ready" in MOS. Defaults to 120 seconds.
-  * `instance_name` - The name of instance to be created, such as "ubuntu01". The default
-  value of this if not specified is 'default'.
-* `instance_type` - The type of instance, such as "C1_M1". The default
-  value of this if not specified is "C1_M2".
-* `keypair_name` - The name of the keypair to use to bootstrap images
-   which support it.
-* `secret_access_url` - The accee url for accessing MOS
-* `region` - The region to start the instance in, such as "us-east-1"
-* `secret_access_key` - The secret access key for accessing MOS
-* `use_iam_profile` - If true, will use [IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
-  for credentials.
+一个典型的配置文档如下所示：
 
-These can be set like typical provider-specific configuration:
-
-```ruby
+```  
 Vagrant.configure("2") do |config|
   # ... other stuff
 
@@ -129,76 +107,30 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-In addition to the above top-level configs, you can use the `region_config`
-method to specify region-specific overrides within your Vagrantfile. Note
-that the top-level `region` config must always be specified to choose which
-region you want to actually use, however. This looks like this:
+## 网络
 
-```ruby
-Vagrant.configure("2") do |config|
-  # ... other stuff
+MOS的网络功能 `config.vm.network` 暂时不支持。如果用户指定相关参数的话，vagrant会给出警告。
 
-  config.vm.provider :mos do |mos|
-    mos.access_key_id = "foo"
-    mos.secret_access_key = "bar"
-    mos.region = "us-east-1"
-
-    # Simple region config
-    mos.region_config "us-east-1", :ami => "ami-12345678"
-
-    # More comprehensive region config
-    mos.region_config "us-west-2" do |region|
-      region.ami = "ami-87654321"
-      region.keypair_name = "company-west"
-    end
-  end
-end
-```
-
-The region-specific configurations will override the top-level
-configurations when that region is used. They otherwise inherit
-the top-level configurations, as you would probably expect.
-
-## Networks
-
-Networking features in the form of `config.vm.network` are not
-supported with `vagrant-mos`, currently. If any of these are
-specified, Vagrant will emit a warning, but will otherwise boot
-the MOS machine.
+## 文件夹同步
 
-## Synced Folders
+MOS 支持文件夹同步。通过使用`rsync` 命令来指定。
 
-There is minimal support for synced folders. Upon `vagrant up`,
-`vagrant reload`, and `vagrant provision`, the MOS provider will use
-`rsync` (if available) to uni-directionally sync the folder to
-the remote machine over SSH.
+具体内容可以参见 [Vagrant Synced folders: rsync](https://docs.vagrantup.com/v2/synced-folders/rsync.html)
 
-See [Vagrant Synced folders: rsync](https://docs.vagrantup.com/v2/synced-folders/rsync.html)
 
+## 自定义开发
 
-## Development
-
-To work on the `vagrant-mos` plugin, clone this repository out, and use
-[Bundler](http://gembundler.com) to get the dependencies:
+如果用户需要在 `vagrant-mos` plugin基础上实现自己的功能，克隆该工程，然后使用
+[Bundler](http://gembundler.com)获得依赖：
 
 ```
 $ bundle
 ```
 
-Once you have the dependencies, verify the unit tests pass with `rake`:
+完成后，使用`rake`测试:
 
 ```
 $ bundle exec rake
 ```
 
-If those pass, you're ready to start developing the plugin. You can test
-the plugin without installing it into your Vagrant environment by just
-creating a `Vagrantfile` in the top level of this directory (it is gitignored)
-and add the following line to your `Vagrantfile` 
-```ruby
-Vagrant.require_plugin "vagrant-mos"
-```
-Use bundler to execute Vagrant:
-```
-$ bundle exec vagrant up --provider=mos
-```
+如果以上步骤没有问题的话，用户就可以开始自己的开发工作了。

data/README_en.md

@@ -0,0 +1,202 @@
+# Vagrant MOS Provider
+
+<span class="badges">
+[![Gem Version](https://badge.fury.io/rb/vagrant-mos.png)][gem]
+[![Dependency Status](https://gemnasium.com/mitchellh/vagrant-mos.png)][gemnasium]
+</span>
+
+[gem]: https://rubygems.org/gems/vagrant-mos
+[gemnasium]: https://gemnasium.com/mitchellh/vagrant-mos
+
+This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds an [MOS](http://cloud.sankuai.com/)
+provider to Vagrant, allowing Vagrant to control and provision machines in
+MOS.
+
+**NOTE:** This plugin requires Vagrant 1.2+,
+
+## Features
+
+* Support for Vagrant's `up`, `status`, `destroy`, `halt`, `reload` and `ssh` commands
+* Boot MOS instances.
+* SSH into the instances.
+* Provision the instances with any built-in Vagrant provisioner.
+* Minimal synced folder support via `rsync`.
+* Manage MOS machine's status through `vagrant status`.  
+  
+## Usage
+
+Install using standard Vagrant 1.2+ plugin installation methods. After
+installing, `vagrant up` and specify the `mos` provider. An example is
+shown below.
+
+```
+$ vagrant plugin install vagrant-mos
+...
+$ vagrant up --provider=mos
+...
+```
+
+Of course prior to doing this, you'll need to obtain an MOS-compatible
+box file for Vagrant.
+
+## Quick Start
+
+After installing the plugin (instructions above), the quickest way to get
+started is to actually use a MOS box and specify all the details
+manually within a `config.vm.provider` block. So first, add the 
+box using any name you want:
+
+```
+$ vagrant box add mos_box https://github.com/yangcs2009/vagrant-mos/raw/master/mos.box
+...
+```
+
+And then make a Vagrantfile that looks like the following, filling in
+your information where necessary.
+
+```
+Vagrant.configure("2") do |config|
+  config.vm.box = "mos_box"
+  config.vm.provider :mos do |mos, override|
+    mos.access_key_id = "YOUR KEY"
+    mos.secret_access_key = "YOUR SECRET KEY"
+    mos.secret_access_url = "YOUR MOS ACCESS URL"
+    mos.keypair_name = "KEYPAIR NAME"
+    mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
+    override.ssh.username = "root"
+    override.ssh.private_key_path = "PATH TO YOUR PRIVATE KEY"
+  end
+end
+```
+
+And then run `vagrant up --provider=mos`.
+
+This will start an Ubuntu 12.04 instance in the us-east-1 region within
+your account. And assuming your SSH information was filled in properly
+within your Vagrantfile, SSH and provisioning will work as well.
+
+Note that normally a lot of this boilerplate is encoded within the box
+file, but the box file used for the quick start, the "dummy" box, has
+no preconfigured defaults.
+
+If you have issues with SSH connecting, make sure that the instances
+are being launched with a security group that allows SSH access.
+
+## Box Format
+
+Every provider in Vagrant must introduce a custom box format. This
+provider introduces `mos` boxes. You can view an example box in
+the [example_box/ directory](https://github.com/mitchellh/vagrant-mos/tree/master/example_box).
+That directory also contains instructions on how to build a box.
+
+The box format is basically just the required `metadata.json` file
+along with a `Vagrantfile` that does default settings for the
+provider-specific configuration for this provider.
+
+## Configuration
+
+This provider exposes quite a few provider-specific configuration options:
+
+* `access_key_id` - The access key for accessing MOS
+* `template_id` - The image id to boot, such as "fa1026fe-c082-4ead-8458-802bf65ca64c"
+* `instance_ready_timeout` - The number of seconds to wait for the instance
+  to become "ready" in MOS. Defaults to 120 seconds.
+  * `instance_name` - The name of instance to be created, such as "ubuntu01". The default
+  value of this if not specified is 'default'.
+* `instance_type` - The type of instance, such as "C1_M1". The default
+  value of this if not specified is "C1_M2".
+* `keypair_name` - The name of the keypair to use to bootstrap images.
+   which support it.
+* `secret_access_url` - The accee url for accessing MOS
+* `region` - The region to start the instance in, such as "us-east-1"
+* `secret_access_key` - The secret access key for accessing MOS
+* `use_iam_profile` - If true, will use [IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
+  for credentials.
+
+These can be set like typical provider-specific configuration:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ... other stuff
+
+  config.vm.provider :mos do |mos|
+    mos.access_key_id = "your_key"
+    mos.secret_access_key = "your_secret"
+    mos.secret_access_url = "your_access_url"
+  end
+end
+```
+
+In addition to the above top-level configs, you can use the `region_config`
+method to specify region-specific overrides within your Vagrantfile. Note
+that the top-level `region` config must always be specified to choose which
+region you want to actually use, however. This looks like this:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ... other stuff
+
+  config.vm.provider :mos do |mos|
+    mos.access_key_id = "foo"
+    mos.secret_access_key = "bar"
+    mos.region = "us-east-1"
+
+    # Simple region config
+    mos.region_config "us-east-1", :template_id => "template_id-12345678"
+
+    # More comprehensive region config
+    mos.region_config "us-west-2" do |region|
+      region.template_id = "template_id-87654321"
+      region.keypair_name = "company-west"
+    end
+  end
+end
+```
+
+The region-specific configurations will override the top-level
+configurations when that region is used. They otherwise inherit
+the top-level configurations, as you would probably expect.
+
+## Networks
+
+Networking features in the form of `config.vm.network` are not
+supported with `vagrant-mos`, currently. If any of these are
+specified, Vagrant will emit a warning, but will otherwise boot
+the MOS machine.
+
+## Synced Folders
+
+There is minimal support for synced folders. Upon `vagrant up`,
+`vagrant reload`, and `vagrant provision`, the MOS provider will use
+`rsync` (if available) to uni-directionally sync the folder to
+the remote machine over SSH.
+
+See [Vagrant Synced folders: rsync](https://docs.vagrantup.com/v2/synced-folders/rsync.html)
+
+
+## Development
+
+To work on the `vagrant-mos` plugin, clone this repository out, and use
+[Bundler](http://gembundler.com) to get the dependencies:
+
+```
+$ bundle
+```
+
+Once you have the dependencies, verify the unit tests pass with `rake`:
+
+```
+$ bundle exec rake
+```
+
+If those pass, you're ready to start developing the plugin. You can test
+the plugin without installing it into your Vagrant environment by just
+creating a `Vagrantfile` in the top level of this directory (it is gitignored)
+and add the following line to your `Vagrantfile` 
+```ruby
+Vagrant.require_plugin "vagrant-mos"
+```
+Use bundler to execute Vagrant:
+```
+$ bundle exec vagrant up --provider=mos
+```

data/example_box/Vagrantfile

@@ -3,6 +3,6 @@
 
 Vagrant.configure("2") do |config|
   config.vm.provider :mos do |mos|
-    mos.ami = "fa1026fe-c082-4ead-8458-802bf65ca64c"
+    mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
   end
 end

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

@@ -26,7 +26,7 @@ module VagrantPlugins
 
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)
-          ami = region_config.ami
+          template_id = region_config.template_id
           name = region_config.name
           instance_type = region_config.instance_type
           keypair = region_config.keypair_name
@@ -41,22 +41,22 @@ module VagrantPlugins
           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(" -- AMI: #{ami}")
-          env[:ui].info(" -- Region: #{region}")
+          env[:ui].info(" -- Template_id: #{template_id}")
+          #env[:ui].info(" -- Region: #{region}")
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
           env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
 
           options = {
               :flavor_id => instance_type,
               :name => name,
-              :image_id => ami,
+              :template_id => template_id,
               :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[:image_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], datadisk=9, bandwidth=2)
           rescue Exception => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/command.rb

@@ -5,8 +5,6 @@ module VagrantPlugins
   module MOS
     class Command < Vagrant.plugin(2, :command)
       def execute
-        puts "Hello!"
-
         machine = @env.machine(:default, :mos)
         region = machine.provider_config.region
 

data/lib/vagrant-mos/config.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
       # The ID of the image to use.
       #
       # @return [String]
-      attr_accessor :ami
+      attr_accessor :template_id
 
       # The name of the instance to create.
       #
@@ -76,7 +76,7 @@ module VagrantPlugins
 
       def initialize(region_specific=false)
         @access_key_id             = UNSET_VALUE
-        @ami                       = UNSET_VALUE
+        @template_id                       = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
         @name                      = UNSET_VALUE
         @instance_type             = UNSET_VALUE
@@ -99,10 +99,10 @@ module VagrantPlugins
 
       # Allows region-specific overrides of any of the settings on this
       # configuration object. This allows the user to override things like
-      # AMI and keypair name for regions. Example:
+      # template_id and keypair name for regions. Example:
       #
       #     mos.region_config "us-east-1" do |region|
-      #       region.ami = "ami-12345678"
+      #       region.template_id = "template_id-12345678"
       #       region.keypair_name = "company-east"
       #     end
       #
@@ -161,8 +161,8 @@ module VagrantPlugins
         @secret_access_key = ENV['MOS_SECRET_KEY'] if @secret_access_key == UNSET_VALUE
         @secret_access_url = ENV['MOS_SECRET_URL'] if @secret_access_url == UNSET_VALUE
 
-        # AMI must be nil, since we can't default that
-        @ami = nil if @ami == UNSET_VALUE
+        # Template_id must be nil, since we can't default that
+        @template_id = nil if @template_id == UNSET_VALUE
 
         # Default instance name is nil
         @name = nil if @name == UNSET_VALUE
@@ -234,7 +234,7 @@ module VagrantPlugins
               config.secret_access_url.nil?
           end
 
-          errors << I18n.interpolate("vagrant_mos.config.ami_required", :region => @region)  if config.ami.nil?
+          errors << I18n.interpolate("vagrant_mos.config.template_id_required", :region => @region)  if config.template_id.nil?
         end
 
         { "MOS Provider" => errors }

data/lib/vagrant-mos/plugin.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
         Config
       end
 
-      command "images" do
+      command "mos-templates" do
         require_relative "command"
         Command
       end

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.18'
+    VERSION = '0.9.20'
   end
 end

data/locales/en.yml

@@ -41,8 +41,8 @@ en:
     config:
       access_key_id_required: |-
         An access key ID must be specified via "access_key_id"
-      ami_required: |-
-        An AMI must be configured via "ami" (region: #{region})
+      template_id_required: |-
+        An template_id must be configured via "template_id" (region: #{region})
       private_key_missing: |-
         The specified private key for MOS could not be found
       region_required: |-

data/spec/vagrant-mos/config_spec.rb

@@ -16,7 +16,7 @@ describe VagrantPlugins::MOS::Config do
     end
 
     its("access_key_id")     { should be_nil }
-    its("ami")               { should be_nil }
+    its("template_id")               { should be_nil }
     its("instance_ready_timeout") { should == 120 }
     its("name")     { should be_nil }
     its("instance_type")     { should == "C1_M2" }
@@ -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_id, :ami, :instance_ready_timeout,:name,
+    [:access_key_id, :template_id, :instance_ready_timeout,:name,
       :instance_type, :keypair_name, :ssh_host_attribute,
       :region, :secret_access_key, :secret_access_url, :terminate_on_shutdown,
       :use_iam_profile].each do |attribute|
@@ -86,7 +86,7 @@ describe VagrantPlugins::MOS::Config do
 
   describe "region config" do
     let(:config_access_key_id)     { "foo" }
-    let(:config_ami)               { "foo" }
+    let(:config_template_id)               { "foo" }
     let(:config_instance_type)     { "foo" }
     let(:config_name)     { "foo" }
     let(:config_keypair_name)      { "foo" }
@@ -96,7 +96,7 @@ describe VagrantPlugins::MOS::Config do
 
     def set_test_values(instance)
       instance.access_key_id     = config_access_key_id
-      instance.ami               = config_ami
+      instance.template_id               = config_template_id
       instance.instance_type     = config_instance_type
       instance.name     = config_name
       instance.keypair_name      = config_keypair_name
@@ -123,7 +123,7 @@ describe VagrantPlugins::MOS::Config do
       end
 
       its("access_key_id")     { should == config_access_key_id }
-      its("ami")               { should == config_ami }
+      its("template_id")               { should == config_template_id }
       its("instance_type")     { should == config_instance_type }
       its("name")     { should == config_name }
       its("keypair_name")      { should == config_keypair_name }
@@ -149,7 +149,7 @@ describe VagrantPlugins::MOS::Config do
       end
 
       its("access_key_id")     { should == config_access_key_id }
-      its("ami")               { should == config_ami }
+      its("template_id")               { should == config_template_id }
       its("instance_type")     { should == config_instance_type }
       its("name")     { should == config_name }
       its("keypair_name")      { should == config_keypair_name }
@@ -164,12 +164,12 @@ describe VagrantPlugins::MOS::Config do
       subject do
         # Set the values on a specific region
         instance.region_config region_name do |config|
-          config.ami = "child"
+          config.template_id = "child"
         end
 
         # Set some top-level values
         instance.access_key_id = "parent"
-        instance.ami = "parent"
+        instance.template_id = "parent"
 
         # Finalize and get the region
         instance.finalize!
@@ -177,18 +177,18 @@ describe VagrantPlugins::MOS::Config do
       end
 
       its("access_key_id") { should == "parent" }
-      its("ami")           { should == "child" }
+      its("template_id")           { should == "child" }
     end
 
     describe "shortcut configuration" do
       subject do
         # Use the shortcut configuration to set some values
-        instance.region_config "us-east-1", :ami => "child"
+        instance.region_config "us-east-1", :template_id => "child"
         instance.finalize!
         instance.get_region_config("us-east-1")
       end
 
-      its("ami") { should == "child" }
+      its("template_id") { should == "child" }
     end
 
     describe "merging" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.20
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mos-sdk
@@ -90,6 +90,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - README.md
+- README_en.md
 - Vagrantfile
 - example_box/README.md
 - example_box/Vagrantfile
@@ -97,7 +98,6 @@ files:
 - lib/vagrant-mos.rb
 - lib/vagrant-mos/action.rb
 - lib/vagrant-mos/action/connect_mos.rb
-- lib/vagrant-mos/action/describe_templates.rb
 - lib/vagrant-mos/action/is_created.rb
 - lib/vagrant-mos/action/is_stopped.rb
 - lib/vagrant-mos/action/message_already_created.rb

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

@@ -1,40 +0,0 @@
-require "log4r"
-
-module VagrantPlugins
-  module MOS
-    module Action
-      # This action reads the state of the machine and puts it in the
-      # `:machine_state_id` key in the environment.
-      class DescribeTemplates
-        def initialize(app, env)
-          @app    = app
-          @logger = Log4r::Logger.new("vagrant_mos::action::read_state")
-          puts 1
-        end
-
-        def call(env)
-          env[:machine_state_id] = read_state(env[:mos_compute], env[:machine])
-           puts 2
-          @app.call(env)
-        end
-
-        def describe_templates(mos, machine)
-          return :not_created if machine.id.nil?
-
-          # Find the templates
-          server = (mos.describe_templates())
-          puts 4
-          if server.nil? || [:"deleting"].include?(server["status"])
-            # The machine can't be found
-            @logger.info("Machine not found or terminated, assuming it got destroyed.")
-            machine.id = nil
-            return :not_created
-          end
-          puts 5
-          puts server["Template"]
-
-        end
-      end
-    end
-  end
-end