vagrant-aws 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af2e697fcbbf3ff15a67a92539b492944ba5784
-  data.tar.gz: 3729da1381c5fed78328854b5a447d104fb82212
+  metadata.gz: a1deca95df376c2977458f95179407a4c2e04458
+  data.tar.gz: 9d4a5506219f5f3f8db34ea476d9aa986ae75ec8
 SHA512:
-  metadata.gz: 1f3c1b091c706c26507221206a92de3f8b7ba8d9f421c37de7164f84ed652838afa0d59127243e3ae863435a553c61f37b6bcd17d548c5c39946354b637fac53
-  data.tar.gz: 07c726e7633b5913e74d0e522044607253248d6bff1d00dde238f9d9ff54cd6764adc4c33dc3cce442d827dc48571a1c95c6b1774d144fe0b8884c5ac9deef9b
+  metadata.gz: 96d998cf0955fab6abfac02fc5b386fb7ee15dcb224e0abbb145970cf14365d6c9881016e8b8ec90088903fb773c2b623277edfe121c7780bf72e7b049309ad9
+  data.tar.gz: 69777208d9687dcf5038a182af1e97258aaba0b630798f4f0b61bab0fb1a473c9809664c18a7e9385e85cee2d6f2e3dcd5d9f3880720699f2533dea4aec985d6

data/CHANGELOG.md

@@ -1,6 +1,11 @@
-# 0.5.1 
+# 0.6.1
+
+* Added configurable instance state check interval
+
+# 0.6.0 (December 13, 2014)
 
 * Support static Elastic IP addresses.
+* Support for creating AMIs with the `vagrant package`
 
 # 0.5.0 (June 22, 2014)
 
@@ -12,6 +17,8 @@
 * rsyncing folders uses `--delete` flag to better emulate "real shared folders
   (GH [#194](https://github.com/mitchellh/vagrant-aws/pull/194))
 * fog gem version bumped to 1.22 (GH [#253](https://github.com/mitchellh/vagrant-aws/pull/253))
+* Simple ELB support (GH [#88](https://github.com/mitchellh/vagrant-aws/pull/88),
+  GH [#238](https://github.com/mitchellh/vagrant-aws/pull/238))
 
 # 0.4.1 (December 17, 2013)
 

data/Gemfile

@@ -6,5 +6,9 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git"
+end
+
+group :plugins do
+  gem "vagrant-aws" , path: "."
 end

data/README.md

@@ -108,6 +108,8 @@ This provider exposes quite a few provider-specific configuration options:
   the instance. If nil, it will use the default set by Amazon.
 * `instance_ready_timeout` - The number of seconds to wait for the instance
   to become "ready" in AWS. Defaults to 120 seconds.
+* `instance_check_interval` - The number of seconds to wait to check the instance's
+ state
 * `instance_package_timeout` - The number of seconds to wait for the instance
   to be burnt into an AMI during packaging. Defaults to 600 seconds.
 * `instance_type` - The type of instance, such as "m3.medium". The default
@@ -116,6 +118,7 @@ This provider exposes quite a few provider-specific configuration options:
   type to support both paravirtualization and hvm AMIs
 * `keypair_name` - The name of the keypair to use to bootstrap AMIs
    which support it.
+* `monitoring` - Set to "true" to enable detailed monitoring.
 * `session_token` - The session token provided by STS
 * `private_ip_address` - The private IP address to assign to an instance
   within a [VPC](http://aws.amazon.com/vpc/)
@@ -133,10 +136,23 @@ This provider exposes quite a few provider-specific configuration options:
   with the instance
 * `subnet_id` - The subnet to boot the instance into, for VPC.
 * `associate_public_ip` - If true, will associate a public IP address to an instance in a VPC.
+* `ssh_host_attribute` - If `:public_ip_address`, `:dns_name`, or
+  `:private_ip_address`, will use the public IP address, DNS name, or private
+  IP address, respectively, to SSH to the instance. By default Vagrant uses the
+  first of these (in this order) that is known. However, this can lead to
+  connection issues if, e.g., you are assigning a public IP address but your
+  security groups prevent public SSH access and require you to SSH in via the
+  private IP address; specify `:private_ip_address` in this case.
+* `tenancy` - When running in a VPC configure the tenancy of the instance.  Supports 'default' and 'dedicated'.
 * `tags` - A hash of tags to set on the machine.
+* `package_tags` - A hash of tags to set on the ami generated during the package operation.
 * `use_iam_profile` - If true, will use [IAM profiles](http://docs.aws.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.
+* `unregister_elb_from_az` - Removes the ELB from the AZ on removal of the last instance if true (default). In non default VPC this has to be false.
+* `terminate_on_shutdown` - Indicates whether an instance stops or terminates
+  when you initiate shutdown from the instance.
 
 These can be set like typical provider-specific configuration:
 
@@ -249,7 +265,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### Elastic Load Balancers
+### ELB (Elastic Load Balancers)
 
 You can automatically attach an instance to an ELB during boot and detach on destroy.
 

data/lib/vagrant-aws/action.rb

@@ -73,7 +73,6 @@ module VagrantPlugins
             end
 
             b2.use Provision
-            b2.use SyncedFolders
           end
         end
       end
@@ -143,6 +142,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use HandleBox
           b.use ConfigValidate
+          b.use BoxCheckOutdated
           b.use ConnectAWS
           b.use Call, IsCreated do |env1, b1|
             if env1[:result]

data/lib/vagrant-aws/action/package_instance.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
 
             # Find ami id
             @ami_id = ami_response.data[:body]["imageId"]
-            
+
             # Attempt to burn the aws instance into an AMI within timeout
             env[:metrics]["instance_ready_time"] = Util::Timer.time do
               
@@ -58,6 +58,9 @@ module VagrantPlugins
               tries = region_config.instance_package_timeout / 2
 
               env[:ui].info(I18n.t("vagrant_aws.burning_ami", :ami_id => @ami_id))
+              if !region_config.package_tags.empty?
+                server.service.create_tags(@ami_id, region_config.package_tags)
+              end
 
               # Check the status of the AMI every 2 seconds until the ami burn timeout has been reached
               begin
@@ -69,16 +72,14 @@ module VagrantPlugins
                   ami_obj = server.service.images.get(@ami_id)
 
                   # Wait for the server to be ready, raise error if timeout reached 
-                  server.wait_for(2) { 
+                  server.wait_for(2) {
                     if ami_obj.state == "failed"
                       raise Errors::InstancePackageError, 
                         ami_id: ami_obj.id,
                         err: ami_obj.state
-                      return
-                    else
-                      # Successful AMI burn will result in true here
-                      ami_obj.ready?
                     end
+
+                    ami_obj.ready?
                   }
                 end
               rescue Fog::Errors::TimeoutError

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

@@ -33,7 +33,7 @@ module VagrantPlugins
           ssh_host_attribute = machine.provider_config.
               get_region_config(machine.provider_config.region).ssh_host_attribute
           # default host attributes to try. NOTE: Order matters!
-          ssh_attrs = [:public_ip_address, :dns_name, :private_ip_address]
+          ssh_attrs = [:dns_name, :public_ip_address, :private_ip_address]
           ssh_attrs = (Array(ssh_host_attribute) + ssh_attrs).uniq if ssh_host_attribute
           # try each attribute, get out on first value
           host_value = nil

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

@@ -42,7 +42,10 @@ module VagrantPlugins
           iam_instance_profile_name = region_config.iam_instance_profile_name
           monitoring            = region_config.monitoring
           ebs_optimized         = region_config.ebs_optimized
+          source_dest_check     = region_config.source_dest_check
           associate_public_ip   = region_config.associate_public_ip
+          kernel_id             = region_config.kernel_id
+          tenancy               = region_config.tenancy
 
           # If there is no keypair then warn the user
           if !keypair
@@ -73,7 +76,9 @@ module VagrantPlugins
           env[:ui].info(" -- Terminate On Shutdown: #{terminate_on_shutdown}")
           env[:ui].info(" -- Monitoring: #{monitoring}")
           env[:ui].info(" -- EBS optimized: #{ebs_optimized}")
+          env[:ui].info(" -- Source Destination check: #{source_dest_check}")
           env[:ui].info(" -- Assigning a public IP address in a VPC: #{associate_public_ip}")
+          env[:ui].info(" -- VPC tenancy specification: #{tenancy}")
 
           options = {
             :availability_zone         => availability_zone,
@@ -90,8 +95,12 @@ module VagrantPlugins
             :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
             :monitoring                => monitoring,
             :ebs_optimized             => ebs_optimized,
-            :associate_public_ip        => associate_public_ip
+            :associate_public_ip       => associate_public_ip,
+            :kernel_id                 => kernel_id,
+            :associate_public_ip       => associate_public_ip,
+            :tenancy                   => tenancy
           }
+
           if !security_groups.empty?
             security_group_key = options[:subnet_id].nil? ? :groups : :security_group_ids
             options[security_group_key] = security_groups
@@ -131,7 +140,7 @@ module VagrantPlugins
                 next if env[:interrupted]
 
                 # Wait for the server to be ready
-                server.wait_for(2, 5) { ready? }
+                server.wait_for(2, region_config.instance_check_interval) { ready? }
               end
             rescue Fog::Errors::TimeoutError
               # Delete the instance
@@ -151,14 +160,43 @@ module VagrantPlugins
             do_elastic_ip(env, domain, server, elastic_ip)
           end
 
+          # Set the source destination checks
+          if !source_dest_check.nil?
+            if server.vpc_id.nil?
+                env[:ui].warn(I18n.t("vagrant_aws.source_dest_checks_no_vpc"))
+            else
+                begin
+                    attrs = {
+                        "SourceDestCheck.Value" => source_dest_check
+                    }
+                    env[:aws_compute].modify_instance_attribute(server.id, attrs)
+                rescue Fog::Compute::AWS::Error => e
+                    raise Errors::FogError, :message => e.message
+                end
+            end
+        end
+
           if !env[:interrupted]
             env[:metrics]["instance_ssh_time"] = Util::Timer.time do
               # Wait for SSH to be ready.
               env[:ui].info(I18n.t("vagrant_aws.waiting_for_ssh"))
+              network_ready_retries = 0
+              network_ready_retries_max = 10
               while true
                 # If we're interrupted then just back out
                 break if env[:interrupted]
-                break if env[:machine].communicate.ready?
+                # When an ec2 instance comes up, it's networking may not be ready
+                # by the time we connect.
+                begin
+                  break if env[:machine].communicate.ready?
+                rescue Exception => e
+                  if network_ready_retries < network_ready_retries_max then
+                    network_ready_retries += 1
+                    @logger.warn(I18n.t("vagrant_aws.waiting_for_ssh, retrying"))
+                  else
+                    raise e
+                  end
+                end
                 sleep 2
               end
             end

data/lib/vagrant-aws/action/start_instance.rb

@@ -32,7 +32,7 @@ module VagrantPlugins
 
             # Wait for the instance to be ready first
             env[:metrics]["instance_ready_time"] = Util::Timer.time do
-              tries = region_config.instance_ready_timeout / 2
+                tries = region_config.instance_ready_timeout / 2
 
               env[:ui].info(I18n.t("vagrant_aws.waiting_for_ready"))
               begin

data/lib/vagrant-aws/config.rb

@@ -24,6 +24,11 @@ module VagrantPlugins
       # @return [Fixnum]
       attr_accessor :instance_ready_timeout
 
+      # The interval to wait for checking an instance's state.
+      #
+      # @return [Fixnum]
+      attr_accessor :instance_check_interval
+
       # The timeout to wait for an instance to successfully burn into an AMI.
       #
       # @return [Fixnum]
@@ -103,6 +108,11 @@ module VagrantPlugins
       # @return [Hash<String, String>]
       attr_accessor :tags
 
+      # The tags for the AMI generated with package.
+      #
+      # @return [Hash<String, String>]
+      attr_accessor :package_tags
+
       # Use IAM Instance Role for authentication to AWS instead of an
       # explicit access_id and secret_access_key
       #
@@ -144,6 +154,11 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :ebs_optimized
 
+      # Source Destination check
+      #
+      # @return [Boolean]
+      attr_accessor :source_dest_check
+
       # Assigning a public IP address in a VPC
       #
       # @return [Boolean]
@@ -155,10 +170,26 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :elb
 
+      # Disable unregisering ELB's from AZ - useful in case of not using default VPC
+      # @return [Boolean]
+      attr_accessor :unregister_elb_from_az
+
+      # Kernel Id
+      #
+      # @return [String]
+      attr_accessor :kernel_id
+
+      # The tenancy of the instance in a VPC.
+      # Defaults to 'default'.
+      #
+      # @return [String]
+      attr_accessor :tenancy
+
       def initialize(region_specific=false)
         @access_key_id             = UNSET_VALUE
         @ami                       = UNSET_VALUE
         @availability_zone         = UNSET_VALUE
+        @instance_check_interval   = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
         @instance_package_timeout  = UNSET_VALUE
         @instance_type             = UNSET_VALUE
@@ -172,6 +203,7 @@ module VagrantPlugins
         @security_groups           = UNSET_VALUE
         @subnet_id                 = UNSET_VALUE
         @tags                      = {}
+        @package_tags              = {}
         @user_data                 = UNSET_VALUE
         @use_iam_profile           = UNSET_VALUE
         @block_device_mapping      = []
@@ -182,8 +214,12 @@ module VagrantPlugins
         @ssh_host_attribute        = UNSET_VALUE
         @monitoring                = UNSET_VALUE
         @ebs_optimized             = UNSET_VALUE
+        @source_dest_check         = UNSET_VALUE
         @associate_public_ip       = UNSET_VALUE
         @elb                       = UNSET_VALUE
+        @unregister_elb_from_az    = UNSET_VALUE
+        @kernel_id                 = UNSET_VALUE
+        @tenancy                   = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -257,6 +293,10 @@ module VagrantPlugins
           result.tags.merge!(self.tags)
           result.tags.merge!(other.tags)
 
+          # Merge in the package tags
+          result.package_tags.merge!(self.package_tags)
+          result.package_tags.merge!(other.package_tags)
+
           # Merge block_device_mapping
           result.block_device_mapping |= self.block_device_mapping
           result.block_device_mapping |= other.block_device_mapping
@@ -276,6 +316,9 @@ module VagrantPlugins
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
 
+        # Set the default interval to check instance state
+        @instance_check_interval = 2 if @instance_check_interval == UNSET_VALUE
+
         # Set the default timeout for waiting for an instance to burn into and ami
         @instance_package_timeout = 600 if @instance_package_timeout == UNSET_VALUE
 
@@ -326,12 +369,23 @@ module VagrantPlugins
         # default false
         @ebs_optimized = false if @ebs_optimized == UNSET_VALUE
 
+        # default to nil
+        @source_dest_check = nil if @source_dest_check == UNSET_VALUE
+
         # default false
         @associate_public_ip = false if @associate_public_ip == UNSET_VALUE
 
+        # default 'default'
+        @tenancy = "default" if @tenancy == UNSET_VALUE
+
         # Don't attach instance to any ELB by default
         @elb = nil if @elb == UNSET_VALUE
 
+        @unregister_elb_from_az = true if @unregister_elb_from_az == UNSET_VALUE
+
+        # default to nil
+        @kernel_id = nil if @kernel_id == UNSET_VALUE
+
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.
         if !@__region_specific
@@ -378,7 +432,7 @@ module VagrantPlugins
             errors << I18n.t("vagrant_aws.config.subnet_id_required_with_public_ip")
           end
 
-          errors << I18n.interpolate("vagrant_aws.config.ami_required", :region => @region)  if config.ami.nil?
+          errors << I18n.t("vagrant_aws.config.ami_required", :region => @region)  if config.ami.nil?
         end
 
         { "AWS Provider" => errors }

data/lib/vagrant-aws/util/elb.rb

@@ -20,7 +20,9 @@ module VagrantPlugins
         if elb.instances.include? instance_id
           elb.deregister_instances([instance_id])
           env[:ui].info I18n.t("vagrant_aws.elb.ok"), :prefix => false
-          adjust_availability_zones env, elb
+          if env[:machine].provider_config.unregister_elb_from_az
+            adjust_availability_zones env, elb
+          end
         else
           env[:ui].info I18n.t("vagrant_aws.elb.skipped"), :prefix => false
         end

data/lib/vagrant-aws/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AWS
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/locales/en.yml

@@ -39,6 +39,9 @@ en:
       Make sure rsync is installed and the binary can be found in the PATH.
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
+    source_dest_checks_no_vpc: |-
+      Warning! Ignoring source_dest_checks flag as it can only be configured on
+      a VPC instance.
     starting: |-
       Starting the instance...
     stopping: |-

data/spec/vagrant-aws/config_spec.rb

@@ -1,4 +1,5 @@
 require "vagrant-aws/config"
+require 'rspec/its'
 
 describe VagrantPlugins::AWS::Config do
   let(:instance) { described_class.new }
@@ -19,6 +20,7 @@ describe VagrantPlugins::AWS::Config do
     its("ami")               { should be_nil }
     its("availability_zone") { should be_nil }
     its("instance_ready_timeout") { should == 120 }
+    its("instance_check_interval") { should == 2 }
     its("instance_package_timeout") { should == 600 }
     its("instance_type")     { should == "m3.medium" }
     its("keypair_name")      { should be_nil }
@@ -31,15 +33,19 @@ describe VagrantPlugins::AWS::Config do
     its("iam_instance_profile_arn") { should be_nil }
     its("iam_instance_profile_name") { should be_nil }
     its("tags")              { should == {} }
+    its("package_tags")      { should == {} }
     its("user_data")         { should be_nil }
-    its("use_iam_profile")   { should be_false }
+    its("use_iam_profile")   { should be false }
     its("block_device_mapping")  {should == [] }
     its("elastic_ip")        { should be_nil }
     its("terminate_on_shutdown") { should == false }
     its("ssh_host_attribute") { should be_nil }
     its("monitoring")        { should == false }
     its("ebs_optimized")     { should == false }
+    its("source_dest_check")       { should be_nil }
     its("associate_public_ip")     { should == false }
+    its("unregister_elb_from_az") { should == true }
+    its("tenancy")     { should == "default" }
   end
 
   describe "overriding defaults" do
@@ -50,9 +56,10 @@ describe VagrantPlugins::AWS::Config do
     [: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, :session_token, :monitoring,
-      :associate_public_ip, :subnet_id, :tags, :elastic_ip, :terminate_on_shutdown,
-      :iam_instance_profile_arn, :iam_instance_profile_name,
-      :use_iam_profile, :user_data, :block_device_mapping].each do |attribute|
+      :associate_public_ip, :subnet_id, :tags, :package_tags, :elastic_ip,
+      :terminate_on_shutdown, :iam_instance_profile_arn, :iam_instance_profile_name,
+      :use_iam_profile, :user_data, :block_device_mapping,
+      :source_dest_check].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -209,6 +216,8 @@ describe VagrantPlugins::AWS::Config do
       it "should merge the tags and block_device_mappings" do
         first.tags["one"] = "one"
         second.tags["two"] = "two"
+        first.package_tags["three"] = "three"
+        second.package_tags["four"] = "four"
         first.block_device_mapping = [{:one => "one"}]
         second.block_device_mapping = [{:two => "two"}]
 
@@ -217,6 +226,10 @@ describe VagrantPlugins::AWS::Config do
           "one" => "one",
           "two" => "two"
         }
+        third.package_tags.should == {
+          "three" => "three",
+          "four" => "four"
+        }
         third.block_device_mapping.index({:one => "one"}).should_not be_nil
         third.block_device_mapping.index({:two => "two"}).should_not be_nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-aws
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mitchell Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-aws
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in EC2 and VPC.