vagrant-mos 0.8.46 → 0.8.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 805a035425025f10c0e812b8c8c6a86bb5d9f57b
-  data.tar.gz: 79631bc72596991fe469e726d751a7cd6979d18b
+  metadata.gz: 68c350a1139be7f4dae4b40159244cba1a80c49c
+  data.tar.gz: 23d499bae32002b845077d98bd72e6dfa65eb0fb
 SHA512:
-  metadata.gz: 5f1bd3b4938b1e03dc62bddc6f9d6e643421bfe7e5f98df87806955fe86a22ee42f16f430c94b04618dbc25443cd8f06dcd4c4dd70b5f8644997d913ed062b20
-  data.tar.gz: ddbb329f4df6cfef9ed1c6c388b02d3b64573bae7f6d133af5d4134d1352d8799a599853f6e161bbc588065edc01c5c7bd1b75f507925a0225fb2fa61ceca91d
+  metadata.gz: 501cc32dd30fcbd949a927123f2211f5b5761ae0530814b0930521120cf30966bde81bc42159b36fa28013854111711b4fb78bc2c4445015a0d695cde8e5e019
+  data.tar.gz: 1b6d8ee950e0a74f0499556dfea70996da13d9b8dab41876f476806b35814ec4de5ebfa90e068423528e93ac7b2361c3db0597e0f57b9f6d178739f4318eb6b7

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

@@ -49,6 +49,7 @@ module VagrantPlugins
           #include MOS
 
           # env[:mos_elb]     = Fog::MOS::ELB.new(fog_config.except(:provider, :endpoint))
+          @app.call(env)
         end
       end
     end

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

@@ -36,7 +36,7 @@ module VagrantPlugins
           tags = region_config.tags
           user_data = region_config.user_data
           block_device_mapping = region_config.block_device_mapping
-          elastic_ip = region_config.elastic_ip
+          #elastic_ip = region_config.elastic_ip
           terminate_on_shutdown = region_config.terminate_on_shutdown
           iam_instance_profile_arn = region_config.iam_instance_profile_arn
           iam_instance_profile_name = region_config.iam_instance_profile_name
@@ -50,9 +50,9 @@ module VagrantPlugins
           end
 
           # If there is a subnet ID then warn the user
-          if subnet_id && !elastic_ip
-            env[:ui].warn(I18n.t("vagrant_mos.launch_vpc_warning"))
-          end
+          #if subnet_id && !elastic_ip
+          #  env[:ui].warn(I18n.t("vagrant_mos.launch_vpc_warning"))
+          #end
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_mos.launching_instance"))
@@ -65,7 +65,7 @@ module VagrantPlugins
           env[:ui].info(" -- IAM Instance Profile ARN: #{iam_instance_profile_arn}") if iam_instance_profile_arn
           env[:ui].info(" -- IAM Instance Profile Name: #{iam_instance_profile_name}") if iam_instance_profile_name
           env[:ui].info(" -- Private IP: #{private_ip_address}") if private_ip_address
-          env[:ui].info(" -- Elastic IP: #{elastic_ip}") if elastic_ip
+          #env[:ui].info(" -- Elastic IP: #{elastic_ip}") if elastic_ip
           env[:ui].info(" -- User Data: yes") if user_data
           env[:ui].info(" -- Security Groups: #{security_groups.inspect}") if !security_groups.empty?
           env[:ui].info(" -- User Data: #{user_data}") if user_data
@@ -159,10 +159,10 @@ module VagrantPlugins
           @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")
 
           # Allocate and associate an elastic IP if requested
-          if elastic_ip
-            domain = subnet_id ? 'vpc' : 'standard'
-            do_elastic_ip(env, domain, server, elastic_ip)
-          end
+          #if elastic_ip
+          #  domain = subnet_id ? 'vpc' : 'standard'
+          #  do_elastic_ip(env, domain, server, elastic_ip)
+          #end
 
           if !env[:interrupted]
             env[:metrics]["instance_ssh_time"] = Util::Timer.time do
@@ -210,6 +210,7 @@ module VagrantPlugins
           !rules.select { |r| (r["fromPort"]..r["toPort"]).include?(port) }.empty?
         end
 
+=begin
         def do_elastic_ip(env, domain, server, elastic_ip)
           if elastic_ip =~ /\d+\.\d+\.\d+\.\d+/
             begin
@@ -273,6 +274,7 @@ module VagrantPlugins
           raise Errors::FogError,
                 :message => message
         end
+=end
 
         def terminate(env)
           destroy_env = env.dup

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

@@ -16,14 +16,14 @@ module VagrantPlugins
           region         = env[:machine].provider_config.region
           region_config  = env[:machine].provider_config.get_region_config(region)
 
-          elastic_ip     = region_config.elastic_ip
+          #elastic_ip     = region_config.elastic_ip
 
           # Release the elastic IP
-          ip_file = env[:machine].data_dir.join('elastic_ip')
-          if ip_file.file?
-            release_address(env,ip_file.read)
-            ip_file.delete
-          end
+          #ip_file = env[:machine].data_dir.join('elastic_ip')
+          #if ip_file.file?
+          #  release_address(env,ip_file.read)
+          #  ip_file.delete
+          #end
 
           # Destroy the server and remove the tracking ID
           env[:ui].info(I18n.t("vagrant_mos.terminating"))

data/lib/vagrant-mos/config.rb

@@ -170,7 +170,7 @@ module VagrantPlugins
         @user_data                 = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
         @block_device_mapping      = []
-        @elastic_ip                = UNSET_VALUE
+        #@elastic_ip                = UNSET_VALUE
         @iam_instance_profile_arn  = UNSET_VALUE
         @iam_instance_profile_name = UNSET_VALUE
         @terminate_on_shutdown     = UNSET_VALUE
@@ -283,7 +283,7 @@ module VagrantPlugins
         @private_ip_address = nil if @private_ip_address == UNSET_VALUE
 
         # Acquire an elastic IP if requested
-        @elastic_ip = nil if @elastic_ip == UNSET_VALUE
+        #@elastic_ip = nil if @elastic_ip == UNSET_VALUE
 
         # Default region is us-east-1. This is sensible because MOS
         # generally defaults to this as well.

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.46'
+    VERSION = '0.8.49'
   end
 end

data/spec/vagrant-mos/config_spec.rb

@@ -34,7 +34,7 @@ describe VagrantPlugins::MOS::Config do
     its("user_data")         { should be_nil }
     its("use_iam_profile")   { should be_false }
     its("block_device_mapping")  {should == [] }
-    its("elastic_ip")        { should be_nil }
+    #its("elastic_ip")        { should be_nil }
     its("terminate_on_shutdown") { should == false }
     its("ssh_host_attribute") { should be_nil }
     its("monitoring")        { should == false }

metadata

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