vagrant-mos 0.9.21 → 0.9.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45f82edbe87bfdf7054790b4e9f809b8e3b263cb
-  data.tar.gz: 6bcb2b58893150c21f47222e0de992527d3f8b32
+  metadata.gz: 59e8c991547bfb7555e28e96c2e52528498c85e4
+  data.tar.gz: ec50bd104241ec26fe1f4ffddba38db553bdec16
 SHA512:
-  metadata.gz: 8d7b4b6c452f255a0800cf8c539ed383eda096e5f4d1e29066954bd813e7dc66edb611177450ab2d69d1cace595617b572c3db649c3d1346c574630823e3e639
-  data.tar.gz: c5ee63ab8f464dd3c20a00731db8e59dc094166b49ebf1af380bb8f2b5c94d0baa3d87acee14e68bab3357637e201fb45cd543eaca2a66d52544143f5f87c909
+  metadata.gz: b1e0ea145f8ebb7ed9e3650b451be5892f4dcb01e676199dd034c223c146070613671064575a33128417b16bb6b094fe8f3f7f65d7016909ca73ec0e743311f5
+  data.tar.gz: 3694313d40e5bb402e48bd88d26e1d16612cf8c92cc83621ce7429a9188c93019da15f5ecf4d6fde0ea1ef3cda37ebd9de52213b8954a9d17a96faa8ab6ca226

data/README.md

@@ -58,7 +58,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider :mos do |mos, override|
     mos.access_key = "YOUR KEY"
     mos.access_secret = "YOUR SECRET KEY"
-    mos.access_ur = "YOUR MOS ACCESS URL"
+    mos.access_url = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
 
     mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
@@ -84,7 +84,7 @@ MOS provider设置了若干参数，主要参数说明如下：
 
 * `access_key` - 访问美团云的key
 * `access_secret` - 访问美团云的secret
-* `access_ur` -访问美团云的url
+* `access_url` -访问美团云的url
 * `region` - 创建主机的region，例如 "us-east-1"
 * `template_id` - 创建美团云主机的镜像，例如 "fa1026fe-c082-4ead-8458-802bf65ca64c"，用户可以使用`vagrant mos-templates`查看可以使用的镜像
 * `instance_ready_timeout` - 等待MOS主机创建成功最长时间，单位为秒。默认为120s。
@@ -102,7 +102,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider :mos do |mos|
     mos.access_key = "your_key"
     mos.access_secret = "your_secret"
-    mos.access_ur = "your_access_url"
+    mos.access_url = "your_access_urll"
   end
 end
 ```

data/README_en.md

@@ -60,7 +60,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider :mos do |mos, override|
     mos.access_key = "YOUR KEY"
     mos.access_secret = "YOUR SECRET KEY"
-    mos.access_ur = "YOUR MOS ACCESS URL"
+    mos.access_url = "YOUR MOS ACCESS URL"
     mos.keypair_name = "KEYPAIR NAME"
     mos.template_id = "fa1026fe-c082-4ead-8458-802bf65ca64c"
     override.ssh.username = "root"
@@ -107,7 +107,7 @@ This provider exposes quite a few provider-specific configuration options:
   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_ur` - The accee url for accessing MOS
+* `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)
@@ -122,7 +122,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider :mos do |mos|
     mos.access_key = "your_key"
     mos.access_secret = "your_secret"
-    mos.access_ur = "your_access_url"
+    mos.access_url = "your_access_urll"
   end
 end
 ```

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

@@ -22,7 +22,7 @@ module VagrantPlugins
           region_config = env[:machine].provider_config.get_region_config(region)
 
           @logger.info("Connecting to MOS...")
-          env[:mos_compute] = Client.new(region_config.access_key, region_config.access_secret, region_config.access_ur)
+          env[:mos_compute] = Client.new(region_config.access_key, region_config.access_secret, region_config.access_url)
 
           @app.call(env)
         end

data/lib/vagrant-mos/command.rb

@@ -12,7 +12,7 @@ module VagrantPlugins
         region_config = machine.provider_config.get_region_config(region)
 
         @logger.info("Connecting to MOS...")
-        mos_compute = Client.new(region_config.access_key, region_config.access_secret, region_config.access_ur)
+        mos_compute = Client.new(region_config.access_key, region_config.access_secret, region_config.access_url)
         results = mos_compute.describe_templates['Template']
         puts results
         0

data/lib/vagrant-mos/config.rb

@@ -51,7 +51,7 @@ module VagrantPlugins
       # The secret access url for accessing MOS.
       #
       # @return [String]
-      attr_accessor :access_ur
+      attr_accessor :access_url
 
       # Use IAM Instance Role for authentication to MOS instead of an
       # explicit access_id and access_secret
@@ -84,7 +84,7 @@ module VagrantPlugins
         @region                    = UNSET_VALUE
         @version                   = UNSET_VALUE
         @access_secret         = UNSET_VALUE
-        @access_ur         = UNSET_VALUE
+        @access_url         = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
         @terminate_on_shutdown     = UNSET_VALUE
         @ssh_host_attribute        = UNSET_VALUE
@@ -159,7 +159,7 @@ module VagrantPlugins
         # 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_ur = ENV['MOS_SECRET_URL'] if @access_ur == 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
@@ -230,8 +230,8 @@ module VagrantPlugins
               config.access_key.nil?
             errors << I18n.t("vagrant_mos.config.access_secret_required") if \
               config.access_secret.nil?
-            errors << I18n.t("vagrant_mos.config.access_ur_required") if \
-              config.access_ur.nil?
+            errors << I18n.t("vagrant_mos.config.access_url_required") if \
+              config.access_url.nil?
           end
 
           errors << I18n.interpolate("vagrant_mos.config.template_id_required", :region => @region)  if config.template_id.nil?

data/lib/vagrant-mos/version.rb

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

data/locales/en.yml

@@ -49,8 +49,8 @@ en:
         A region must be specified via "region"
       access_secret_required: |-
         A secret access key is required via "access_secret"
-      access_ur_required: |-
-        A secret access url is required via "access_ur"
+      access_url_required: |-
+        A secret access url is required via "access_url"
 
     errors:
       mos_error: |-

data/spec/vagrant-mos/config_spec.rb

@@ -23,7 +23,7 @@ describe VagrantPlugins::MOS::Config do
     its("keypair_name")      { should be_nil }
     its("region")            { should == "us-east-1" }
     its("access_secret") { should be_nil }
-    its("access_ur") { should be_nil }
+    its("access_url") { should be_nil }
     its("use_iam_profile")   { should be_false }
     its("terminate_on_shutdown") { should == false }
     its("ssh_host_attribute") { should be_nil }
@@ -36,7 +36,7 @@ describe VagrantPlugins::MOS::Config do
     # and asserts the proper result comes back out.
     [:access_key, :template_id, :instance_ready_timeout,:name,
       :instance_type, :keypair_name, :ssh_host_attribute,
-      :region, :access_secret, :access_ur, :terminate_on_shutdown,
+      :region, :access_secret, :access_url, :terminate_on_shutdown,
       :use_iam_profile].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
@@ -62,7 +62,7 @@ describe VagrantPlugins::MOS::Config do
 
       its("access_key")     { should be_nil }
       its("access_secret") { should be_nil }
-      its("access_ur")     { should be_nil }
+      its("access_url")     { should be_nil }
     end
 
     context "with MOS credential environment variables" do
@@ -80,7 +80,7 @@ describe VagrantPlugins::MOS::Config do
 
       its("access_key")     { should == "access_key" }
       its("access_secret") { should == "secret_key" }
-      its("access_ur")     { should == "secret_url" }
+      its("access_url")     { should == "secret_url" }
     end
   end
 
@@ -92,7 +92,7 @@ describe VagrantPlugins::MOS::Config do
     let(:config_keypair_name)      { "foo" }
     let(:config_region)            { "foo" }
     let(:config_access_secret) { "foo" }
-    let(:config_access_ur)     { "foo" }
+    let(:config_access_url)     { "foo" }
 
     def set_test_values(instance)
       instance.access_key     = config_access_key
@@ -102,7 +102,7 @@ describe VagrantPlugins::MOS::Config do
       instance.keypair_name      = config_keypair_name
       instance.region            = config_region
       instance.access_secret = config_access_secret
-      instance.access_ur     = config_access_ur
+      instance.access_url     = config_access_url
     end
 
     it "should raise an exception if not finalized" do
@@ -129,7 +129,7 @@ describe VagrantPlugins::MOS::Config do
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == config_region }
       its("access_secret") { should == config_access_secret }
-      its("access_ur") { should == config_access_ur }
+      its("access_url") { should == config_access_url }
     end
 
     context "with a specific config set" do
@@ -155,7 +155,7 @@ describe VagrantPlugins::MOS::Config do
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == region_name }
       its("access_secret") { should == config_access_secret }
-      its("access_ur") { should == config_access_ur }
+      its("access_url") { should == config_access_url }
     end
 
     describe "inheritance of parent config" do

metadata

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