vagrant-mos 0.9.23 → 0.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7ff4eacde4cbb5229ac829e02010269eadcbdf
-  data.tar.gz: 3ad07e6f11dd8136e64cb96091628e587de03589
+  metadata.gz: 3fb943e2fe26ba7b745aa95fd16b2c5252d46050
+  data.tar.gz: a7b9148932b560e9751db3ce0b0c45dcb7c601f4
 SHA512:
-  metadata.gz: f6269d10fc10bf6378f2fcd0cf49ebab5adf25ad6367e80fb09a89ef03aa4ecb35c1b33e747b087fccb88d329459b5972566867c8521324e8c11593b0d5e2aac
-  data.tar.gz: db39fd83ab78a91065f997d3aee02f7f157b49e3693f98615c0f86e8e58bbe1e43c988bbed6606cf65cab016fa550c54af25523ae612af9fabe6e3fc62c44559
+  metadata.gz: 2d98de545c48cd1b20634fd016f4c9641bc75c284019d6151e316876b2765192d4f638d105a5c81d7474b3e426a552548b7bffad5711ca2313ddab905ce413dc
+  data.tar.gz: f57b7334609697ecdba75fd7267e168cbc369e69435c77a36066a292a75089d702b4db020090fb8d339442e7c28ec8e9996a7784f8c85abed780699e41e7f66f

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

@@ -32,7 +32,6 @@ module VagrantPlugins
           name = region_config.name
           instance_type = region_config.instance_type
           keypair = region_config.keypair_name
-          terminate_on_shutdown = region_config.terminate_on_shutdown
 
           # If there is no keypair then warn the user
           if !keypair
@@ -47,7 +46,6 @@ module VagrantPlugins
           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}")
 
           options = {
               :flavor_id => instance_type,
@@ -56,12 +54,11 @@ module VagrantPlugins
               :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], options[:datadisk], options[:bandwidth])
+            server = env[:mos_compute].create_instance(options[:template_id], options[:flavor_id], nil, options[:name], options[:key_name], options[:data_disk], options[:band_width])
           rescue Exception => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/config.rb

@@ -69,11 +69,6 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :use_iam_profile
 
-      # Indicates whether an instance stops or terminates when you initiate shutdown from the instance
-      #
-      # @return [bool]
-      attr_accessor :terminate_on_shutdown
-
       # Specifies which address to connect to with ssh
       # Must be one of:
       #  - :public_ip_address
@@ -98,7 +93,6 @@ module VagrantPlugins
         @access_secret             = UNSET_VALUE
         @access_url                = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
-        @terminate_on_shutdown     = UNSET_VALUE
         @ssh_host_attribute        = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
@@ -202,9 +196,6 @@ module VagrantPlugins
         # By default we don't use an IAM profile
         @use_iam_profile = false if @use_iam_profile == UNSET_VALUE
 
-        # default false
-        @terminate_on_shutdown = false if @terminate_on_shutdown == UNSET_VALUE
-
         # default to nil
         @ssh_host_attribute = nil if @ssh_host_attribute == UNSET_VALUE
 

data/lib/vagrant-mos/version.rb

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

data/spec/vagrant-mos/config_spec.rb

@@ -25,7 +25,6 @@ describe VagrantPlugins::MOS::Config do
     its("access_secret") { 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 }
   end
 
@@ -36,7 +35,7 @@ describe VagrantPlugins::MOS::Config do
     # and asserts the proper result comes back out.
     [: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,
+      :region, :access_secret, :access_url,
       :use_iam_profile].each do |attribute|
 
       it "should not default #{attribute} if overridden" do

metadata

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