vagrant-mos 0.8.80 → 0.8.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b287a4336584152e0c6bddcf296bc36f6d317d9
-  data.tar.gz: b0b6aea44fa92729722717a28dec03bb5f381819
+  metadata.gz: 5384f64d4292efc8f57467849f66a7a1198a903b
+  data.tar.gz: 2e5d749a66c42216790a72e01d76e84e7180bba0
 SHA512:
-  metadata.gz: 2b032e72ff600620fbf76a4de081add51c7005dcf395794fd13677e68a89e83f0fd919104dfdf0c340b017608aca4f1a36765e58d317d2f2748507c7297f0e8a
-  data.tar.gz: 1d5cdb13888b9eeb73acae25dc4cb6c299496026c105b0d4aee240772fc42551595bb715d9e60eead0eeb1fee0e4cf1a78c5569769db5c042b932be2fa6b74a2
+  metadata.gz: bbcc9679c7b1fcc22bd5cb676eef726ebd59a0ae93ad92d83a5bd0bc69d3582a6f35a8b425ad2b754b7ab6f8ca5f4274b9d4e8e26896a282f3a9ecd99354f2ae
+  data.tar.gz: 6a2241f63c674cdcf502098da935bab5d3f9ba704d5101d3c4543a6e252b79f83a3da56ed22bcca53c3100a9979f1eab157b050ca83f9d83d10281038122c1b7

data/README.md

@@ -104,6 +104,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `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

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

@@ -27,6 +27,7 @@ module VagrantPlugins
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)
           ami = region_config.ami
+          instance_name = region_config.instance_name
           instance_type = region_config.instance_type
           keypair = region_config.keypair_name
           terminate_on_shutdown = region_config.terminate_on_shutdown
@@ -38,6 +39,7 @@ module VagrantPlugins
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_mos.launching_instance"))
+          env[:ui].info(" -- Name: #{instance_name}") if instance_name
           env[:ui].info(" -- Type: #{instance_type}")
           env[:ui].info(" -- AMI: #{ami}")
           env[:ui].info(" -- Region: #{region}")
@@ -46,6 +48,7 @@ module VagrantPlugins
 
           options = {
               :flavor_id => instance_type,
+              :instance_name => instance_name,
               :image_id => ami,
               :key_name => keypair,
               :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
@@ -53,7 +56,7 @@ module VagrantPlugins
 
           begin
             # create a handler to access MOS
-            server = env[:mos_compute].create_instance(options[:image_id], options[:flavor_id], nil, nil, options[:key_name], datadisk=9, bandwidth=2)
+            server = env[:mos_compute].create_instance(options[:image_id], options[:flavor_id], nil, options[:instance_name], options[:key_name], datadisk=9, bandwidth=2)
           rescue Exception => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/config.rb

@@ -8,11 +8,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :access_key_id
 
-      # The ID of the AMI to use.
+      # The ID of the image to use.
       #
       # @return [String]
       attr_accessor :ami
 
+      # The name of the instance to create.
+      #
+      # @return [String]
+      attr_accessor :instance_name
+
       # The timeout to wait for an instance to become ready.
       #
       # @return [Fixnum]
@@ -73,6 +78,7 @@ module VagrantPlugins
         @access_key_id             = UNSET_VALUE
         @ami                       = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
+        @instance_name             = UNSET_VALUE
         @instance_type             = UNSET_VALUE
         @keypair_name              = UNSET_VALUE
         @region                    = UNSET_VALUE
@@ -158,11 +164,14 @@ module VagrantPlugins
         # AMI must be nil, since we can't default that
         @ami = nil if @ami == UNSET_VALUE
 
+        # Default instance name is nil
+        @instance_name = nil if @instance_name == UNSET_VALUE
+
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 
 
-        # Default instance type is an m3.medium
+        # Default instance type is an C1_M2
         @instance_type = "C1_M2" if @instance_type == UNSET_VALUE
         # Keypair defaults to nil
         @keypair_name = nil if @keypair_name == UNSET_VALUE

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.80'
+    VERSION = '0.8.81'
   end
 end

data/spec/vagrant-mos/config_spec.rb

@@ -18,6 +18,7 @@ describe VagrantPlugins::MOS::Config do
     its("access_key_id")     { should be_nil }
     its("ami")               { should be_nil }
     its("instance_ready_timeout") { should == 120 }
+    its("instance_name")     { should be_nil }
     its("instance_type")     { should == "C1_M2" }
     its("keypair_name")      { should be_nil }
     its("region")            { should == "us-east-1" }
@@ -33,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,
+    [:access_key_id, :ami, :instance_ready_timeout,:instance_name,
       :instance_type, :keypair_name, :ssh_host_attribute,
       :region, :secret_access_key, :secret_access_url, :terminate_on_shutdown,
       :use_iam_profile].each do |attribute|
@@ -87,6 +88,7 @@ describe VagrantPlugins::MOS::Config do
     let(:config_access_key_id)     { "foo" }
     let(:config_ami)               { "foo" }
     let(:config_instance_type)     { "foo" }
+    let(:config_instance_name)     { "foo" }
     let(:config_keypair_name)      { "foo" }
     let(:config_region)            { "foo" }
     let(:config_secret_access_key) { "foo" }
@@ -96,6 +98,7 @@ describe VagrantPlugins::MOS::Config do
       instance.access_key_id     = config_access_key_id
       instance.ami               = config_ami
       instance.instance_type     = config_instance_type
+      instance.instance_name     = config_instance_name
       instance.keypair_name      = config_keypair_name
       instance.region            = config_region
       instance.secret_access_key = config_secret_access_key
@@ -122,6 +125,7 @@ describe VagrantPlugins::MOS::Config do
       its("access_key_id")     { should == config_access_key_id }
       its("ami")               { should == config_ami }
       its("instance_type")     { should == config_instance_type }
+      its("instance_name")     { should == config_instance_name }
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == config_region }
       its("secret_access_key") { should == config_secret_access_key }
@@ -147,6 +151,7 @@ describe VagrantPlugins::MOS::Config do
       its("access_key_id")     { should == config_access_key_id }
       its("ami")               { should == config_ami }
       its("instance_type")     { should == config_instance_type }
+      its("instance_name")     { should == config_instance_name }
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == region_name }
       its("secret_access_key") { should == config_secret_access_key }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.80
+  version: 0.8.81
 platform: ruby
 authors:
 - yangcs2009
@@ -139,7 +139,6 @@ files:
 - spec/vagrant-mos/config_spec.rb
 - templates/metadata.json.erb
 - templates/vagrant-aws_package_Vagrantfile.erb
-- vagrant-mos-0.8.70.gem
 - vagrant-mos.gemspec
 homepage: http://www.vagrantup.com
 licenses: