vagrant-mos 0.8.49 → 0.8.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c350a1139be7f4dae4b40159244cba1a80c49c
-  data.tar.gz: 23d499bae32002b845077d98bd72e6dfa65eb0fb
+  metadata.gz: 04b8d2373b85b50d9162a7e079d880740b313444
+  data.tar.gz: a26f7c0cd4ee0d05e75ffcb71e0d0236c754e161
 SHA512:
-  metadata.gz: 501cc32dd30fcbd949a927123f2211f5b5761ae0530814b0930521120cf30966bde81bc42159b36fa28013854111711b4fb78bc2c4445015a0d695cde8e5e019
-  data.tar.gz: 1b6d8ee950e0a74f0499556dfea70996da13d9b8dab41876f476806b35814ec4de5ebfa90e068423528e93ac7b2361c3db0597e0f57b9f6d178739f4318eb6b7
+  metadata.gz: 542b11ed583b523ba1dce9bbf436383cf722779ba0f93754974faa1503ca50a57c1e4f28f9a664331b66c80971f8a22345cfc21c8c25fa29b35e02189c965a8f
+  data.tar.gz: a767462abfe8de9950055842191fa0615f30b4c5a5acc4bac7cb5f064993afb14efab6ef06aac4c3a64c37e0ae3c9c61ae598725855629afc90e924cc756440a

data/README.md

@@ -134,7 +134,6 @@ This provider exposes quite a few provider-specific configuration options:
 * `use_iam_profile` - If true, will use [IAM profiles](http://docs.mos.amazon.com/IAM/latest/UserGuide/instance-profiles.html)
   for credentials.
 * `block_device_mapping` - Amazon EC2 Block Device Mapping Property
-* `elb` - The ELB name to attach to the instance.
 
 These can be set like typical provider-specific configuration:
 
@@ -247,20 +246,6 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### ELB (Elastic Load Balancers)
-
-You can automatically attach an instance to an ELB during boot and detach on destroy.
-
-```ruby
-Vagrant.configure("2") do |config|
-  # ... other stuff
-
-  config.vm.provider "mos" do |mos|
-    mos.elb = "production-web"
-  end
-end
-```
-
 ## Development
 
 To work on the `vagrant-mos` plugin, clone this repository out, and use

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

@@ -52,7 +52,8 @@ module VagrantPlugins
           if !host_value
             host_value = server["ipAddresses"]
           end
-          #puts server
+          puts "ssh_host_attribute: #{ssh_host_attribute}"
+          puts "ssh_attrs: #{ssh_attrs}"
           #puts server["ipAddresses"]
           #puts host_value
           #puts 3

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

@@ -41,7 +41,7 @@ module VagrantPlugins
           iam_instance_profile_arn = region_config.iam_instance_profile_arn
           iam_instance_profile_name = region_config.iam_instance_profile_name
           monitoring = region_config.monitoring
-          ebs_optimized = region_config.ebs_optimized
+          #ebs_optimized = region_config.ebs_optimized
           associate_public_ip = region_config.associate_public_ip
 
           # If there is no keypair then warn the user
@@ -72,7 +72,7 @@ module VagrantPlugins
           env[:ui].info(" -- Block Device Mapping: #{block_device_mapping}") if block_device_mapping
           env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
           env[:ui].info(" -- Monitoring: #{monitoring}")
-          env[:ui].info(" -- EBS optimized: #{ebs_optimized}")
+          #env[:ui].info(" -- EBS optimized: #{ebs_optimized}")
           env[:ui].info(" -- Assigning a public IP address in a VPC: #{associate_public_ip}")
 
           options = {
@@ -89,7 +89,7 @@ module VagrantPlugins
               :block_device_mapping => block_device_mapping,
               :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
               :monitoring => monitoring,
-              :ebs_optimized => ebs_optimized,
+              #:ebs_optimized => ebs_optimized,
               :associate_public_ip => associate_public_ip
           }
           if !security_groups.empty?

data/lib/vagrant-mos/config.rb

@@ -137,7 +137,7 @@ module VagrantPlugins
       # EBS optimized instance
       #
       # @return [Boolean]
-      attr_accessor :ebs_optimized
+      #attr_accessor :ebs_optimized
 
       # Assigning a public IP address in a VPC
       #
@@ -148,7 +148,7 @@ module VagrantPlugins
       # attached to
       #
       # @return [String]
-      attr_accessor :elb
+      #attr_accessor :elb
 
       def initialize(region_specific=false)
         @access_key_id             = UNSET_VALUE
@@ -176,9 +176,9 @@ module VagrantPlugins
         @terminate_on_shutdown     = UNSET_VALUE
         @ssh_host_attribute        = UNSET_VALUE
         @monitoring                = UNSET_VALUE
-        @ebs_optimized             = UNSET_VALUE
+        #@ebs_optimized             = UNSET_VALUE
         @associate_public_ip       = UNSET_VALUE
-        @elb                       = UNSET_VALUE
+        #@elb                       = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -318,13 +318,13 @@ module VagrantPlugins
         @monitoring = false if @monitoring == UNSET_VALUE
 
         # default false
-        @ebs_optimized = false if @ebs_optimized == UNSET_VALUE
+        #@ebs_optimized = false if @ebs_optimized == UNSET_VALUE
 
         # default false
         @associate_public_ip = false if @associate_public_ip == UNSET_VALUE
 
         # Don't attach instance to any ELB by default
-        @elb = nil if @elb == UNSET_VALUE
+        #@elb = nil if @elb == UNSET_VALUE
 
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.

data/lib/vagrant-mos/errors.rb

@@ -35,9 +35,9 @@ module VagrantPlugins
         error_key(:mkdir_error)
       end
 
-      class ElbDoesNotExistError < VagrantMOSError
-        error_key("elb_does_not_exist")
-      end
+      #class ElbDoesNotExistError < VagrantMOSError
+      #  error_key("elb_does_not_exist")
+      #end
     end
   end
 end

data/lib/vagrant-mos/version.rb

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

data/locales/en.yml

@@ -4,17 +4,17 @@ en:
       The machine is already %{status}.
     burning_ami: |-
       Waiting for the AMI '%{ami_id}' to burn...
-    elb:
-      adjusting: |-
-        Adjusting availability zones of ELB %{elb_name}...
-      registering: |-
-        Registering %{instance_id} at ELB %{elb_name}...
-      deregistering: |-
-        Deregistering %{instance_id} from ELB %{elb_name}...
-      ok: |-
-        ok
-      skipped: |-
-        skipped
+#    elb:
+#      adjusting: |-
+#        Adjusting availability zones of ELB %{elb_name}...
+#      registering: |-
+#        Registering %{instance_id} at ELB %{elb_name}...
+#      deregistering: |-
+#        Deregistering %{instance_id} from ELB %{elb_name}...
+#      ok: |-
+#        ok
+#      skipped: |-
+#        skipped
 
     launching_instance: |-
       Launching an instance with the following settings...
@@ -115,8 +115,8 @@ en:
 
         Host path: %{hostpath}
         Error: %{err}
-      elb_does_not_exist: |-
-        ELB configured for the instance does not exist
+#      elb_does_not_exist: |-
+#        ELB configured for the instance does not exist
 
     states:
       short_not_created: |-

data/spec/vagrant-mos/config_spec.rb

@@ -38,7 +38,7 @@ describe VagrantPlugins::MOS::Config do
     its("terminate_on_shutdown") { should == false }
     its("ssh_host_attribute") { should be_nil }
     its("monitoring")        { should == false }
-    its("ebs_optimized")     { should == false }
+    #its("ebs_optimized")     { should == false }
     its("associate_public_ip")     { should == false }
   end
 
@@ -49,7 +49,7 @@ describe VagrantPlugins::MOS::Config do
     # and asserts the proper result comes back out.
     [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
       :instance_package_timeout, :instance_type, :keypair_name, :ssh_host_attribute,
-      :ebs_optimized, :region, :secret_access_key, :secret_access_url, :monitoring,
+      :region, :secret_access_key, :secret_access_url, :monitoring,
       :associate_public_ip, :subnet_id, :tags, :terminate_on_shutdown,
       :iam_instance_profile_arn, :iam_instance_profile_name,
       :use_iam_profile, :user_data, :block_device_mapping].each do |attribute|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.49
+  version: 0.8.50
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog