vagrant-mos 0.9.42 → 0.9.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a55b5d146c0fd19249f11f008fc10427db68f06
-  data.tar.gz: 444c50f70865970221693a1514b5325a04a2fb5c
+  metadata.gz: 160df994ad0657f338b42e23d228648e835b85ff
+  data.tar.gz: 804c5c811b81130259bc7dd0ae8041ff490c91ce
 SHA512:
-  metadata.gz: 829278f5df50a0bb7791e16e9daa86fecfdc2c767286f709b5d017bfea6659ab1f6987dba25d096af9b91dad0af93abfc26a2686f8d384958d5face2b6984443
-  data.tar.gz: 82e2d0144abe9fa10ddcabf968123351dfdea3e44fe7fcd488a77b951ab52b194acfe82e4ac12435adf3427e133adaf728e4bc52187459227a0178ef335d9d40
+  metadata.gz: 83fbcffd6227d8effa6b690c7d8073dfe919337ff4d1d3a581428cf55f141facac33a51ea5fb4fbcb6b4960112f74e80393cd4e283c77d93ddec6d45d9e764ce
+  data.tar.gz: 5b8d3516f644a95a8c1c2c9e635d2c58d47a8047cd18dbe197e56d036a771aea1b118eaec529a125be6e2db7346e4ad094bd49cd50103c53ea913fd38ac757a1

data/README.md

@@ -22,6 +22,7 @@ provider，从而使得Vagrant可以像管理VirtualBox那样管理美团云主
 * 通过`vagrant status`命令管理已创建的MOS主机
 * 通过`vagrant package`命令创建MOS实例模板
 * 通过`vagrant mos-templates`查看可使用的模板
+* 通过`vagrant mos-flavors`查看可创建的实例类型，例如"C1_M2"代表1核CPU，2G内存，以此类推
   
 ## 安装使用
 
@@ -55,7 +56,6 @@ $ vagrant init
 ```
 Vagrant.configure("2") do |config|
   config.vm.box = "mos_box"
-
   config.vm.provider :mos do |mos, override|
     mos.access_key = "YOUR KEY"
     mos.access_secret = "YOUR SECRET KEY"

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

@@ -21,6 +21,7 @@ module VagrantPlugins
           return :not_created if machine.id.nil?
 
           # Find the machine
+          puts server = (mos.describe_instances([machine.id]))
           server = (mos.describe_instances([machine.id]))["Instance"]
           if server.nil? || [:"deleting"].include?(server["status"])
             # The machine can't be found

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.9.42'
+    VERSION = '0.9.50'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.9.42
+  version: 0.9.50
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mos-sdk
@@ -90,7 +90,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - README.md
-- README_en.md
 - Vagrantfile
 - example_box/README.md
 - example_box/Vagrantfile

data/README_en.md

@@ -1,202 +0,0 @@
-# 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 = "YOUR KEY"
-    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"
-    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` - 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.
-* `access_url` - The accee url for accessing MOS
-* `region` - The region to start the instance in, such as "us-east-1"
-* `access_secret` - 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 = "your_key"
-    mos.access_secret = "your_secret"
-    mos.access_url = "your_access_urll"
-  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 = "foo"
-    mos.access_secret = "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
-```