vagrant-aws 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724f1ec5fa0d9c7bd580c8e61ed48b89adc3f68f
-  data.tar.gz: 0d69fbb52adcb5587ba5e59289126f0bd2bfb6d1
+  metadata.gz: 6eb997239c2902fd5ffe82a2ad85f6a750b68fcc
+  data.tar.gz: b4db22de6d6004ec60a2bd97f8bea1abe0b23ff8
 SHA512:
-  metadata.gz: 06e1e6f007d498b296c68d12c14852a5c58246a4707d6d0874091d59d05f0dc08caa3f7ce58b75ab91ae2ad3f1d3702a3ea07a12cf5109e3e90092417cf7fc3d
-  data.tar.gz: f4211a869114ac7f4ef6ce5d157e96850150a5e782dd006a37887fc67c85a9427fa19ae1ec23e072233f29704bddfe346df02eb11c4e5009c1e5283a0dfe9de6
+  metadata.gz: 6a38047b88672ff53ff8002acaf948071bd020bac0e6cb4503291a1e10e2fb57406b4f6a6e1fadb63b5d1cfdf601b47b58bbb20191fe1d855a8748e0339422ad
+  data.tar.gz: d93eca59839124a024b471430d8864b4aec2a5d2a8723e3ddb77d2a9babab505a478bc4517cc39db8bd82f1b16a00a238b15347a38d83bf42ae6914d4f57be6f

data/.gitignore

@@ -15,3 +15,7 @@ Gemfile.lock
 .vagrant
 Vagrantfile
 !example_box/Vagrantfile
+
+# RVM files for gemset/ruby setting
+.ruby-*
+.rvmrc

data/.rspec

@@ -0,0 +1 @@
+--format doc --order random --color --fail-fast

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 0.5.0 (unreleased)
 
+* Support for associating public IPs for VMs inside of VPCs (GH
+  [#219](https://github.com/mitchellh/vagrant-aws/pull/219), GH
+  [#205](https://github.com/mitchellh/vagrant-aws/issues/205))
+* Bug-fix for per region configs with `associate_public_ip` (GH
+  [#237](https://github.com/mitchellh/vagrant-aws/pull/237))
+* 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))
+
 # 0.4.1 (December 17, 2013)
 
 * Update fog.io to 1.18.0

data/LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2013 Mitchell Hashimoto
+Copyright (c) 2014 Mitchell Hashimoto
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -115,15 +115,17 @@ This provider exposes quite a few provider-specific configuration options:
 * `secret_access_key` - The secret access key for accessing AWS
 * `security_groups` - An array of security groups for the instance. If this
   instance will be launched in VPC, this must be a list of security group
-  IDs.
+  Name.
 * `iam_instance_profile_arn` - The Amazon resource name (ARN) of the IAM Instance
     Profile to associate with the instance
 * `iam_instance_profile_name` - The name of the IAM Instance Profile to associate
   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.
 * `tags` - A hash of tags to set on the machine.
 * `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
 
 These can be set like typical provider-specific configuration:
 
@@ -222,6 +224,34 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+### Disk size
+
+Need more space on your instance disk? Increase the disk size.
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ... other stuff
+
+  config.vm.provider "aws" do |aws|
+    aws.block_device_mapping = [{ 'DeviceName' => '/dev/sda1', 'Ebs.VolumeSize' => 50 }]
+  end
+end
+```
+
+### 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 "aws" do |aws|
+    aws.elb = "production-web"
+  end
+end
+```
+
 ## Development
 
 To work on the `vagrant-aws` plugin, clone this repository out, and use

data/lib/vagrant-aws/action.rb

@@ -37,6 +37,7 @@ module VagrantPlugins
                 end
               end
               b2.use ConnectAWS
+              b2.use ElbDeregisterInstance
               b2.use TerminateInstance
               b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
             else
@@ -118,6 +119,7 @@ module VagrantPlugins
           b.use Provision
           b.use SyncFolders
           b.use WarnNetworks
+          b.use ElbRegisterInstance
         end
       end
 
@@ -185,6 +187,8 @@ module VagrantPlugins
       autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
       autoload :WaitForState, action_root.join("wait_for_state")
       autoload :WarnNetworks, action_root.join("warn_networks")
+      autoload :ElbRegisterInstance, action_root.join("elb_register_instance")
+      autoload :ElbDeregisterInstance, action_root.join("elb_deregister_instance")
     end
   end
 end

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

@@ -37,6 +37,7 @@ module VagrantPlugins
 
           @logger.info("Connecting to AWS...")
           env[:aws_compute] = Fog::Compute.new(fog_config)
+          env[:aws_elb]     = Fog::AWS::ELB.new(fog_config.except(:provider))
 
           @app.call(env)
         end

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

@@ -0,0 +1,24 @@
+require 'vagrant-aws/util/elb'
+
+module VagrantPlugins
+  module AWS
+    module Action
+      # This registers instance in ELB
+      class ElbDeregisterInstance
+        include ElasticLoadBalancer
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_aws::action::elb_deregister_instance")
+        end
+
+        def call(env)
+          if elb_name = env[:machine].provider_config.elb
+            deregister_instance env, elb_name, env[:machine].id
+          end
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'vagrant-aws/util/elb'
+
+module VagrantPlugins
+  module AWS
+    module Action
+      # This registers instance in ELB
+      class ElbRegisterInstance
+        include ElasticLoadBalancer
+
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_aws::action::elb_register_instance")
+        end
+
+        def call(env)
+          @app.call(env)
+          if elb_name = env[:machine].provider_config.elb
+            register_instance env, elb_name, env[:machine].id
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -42,6 +42,7 @@ module VagrantPlugins
           iam_instance_profile_name = region_config.iam_instance_profile_name
           monitoring            = region_config.monitoring
           ebs_optimized         = region_config.ebs_optimized
+          associate_public_ip   = region_config.associate_public_ip
 
           # If there is no keypair then warn the user
           if !keypair
@@ -72,6 +73,7 @@ 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(" -- Assigning a public IP address in a VPC: #{associate_public_ip}")
 
           options = {
             :availability_zone         => availability_zone,
@@ -87,7 +89,8 @@ 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?
             security_group_key = options[:subnet_id].nil? ? :groups : :security_group_ids

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

@@ -75,11 +75,18 @@ module VagrantPlugins
             #collect rsync excludes specified :rsync_excludes=>['path1',...] in synced_folder options
             excludes = ['.vagrant/', 'Vagrantfile', *Array(data[:rsync_excludes])].uniq
 
+            ssh_options = ["StrictHostKeyChecking=no"]
+	    # Use proxy command if it's set
+            if ssh_info[:proxy_command]
+              ssh_options.push("ProxyCommand #{ssh_info[:proxy_command]}")
+            end
+
             # Rsync over to the guest path using the SSH info
             command = [
-              "rsync", "--verbose", "--archive", "-z",
+              "rsync", "--verbose", "--archive", "-z", "--delete",
               *excludes.map{|e|['--exclude', e]}.flatten,
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
+              "-e", "ssh -p #{ssh_info[:port]} #{ssh_key_options(ssh_info)} " + 
+              ssh_options_to_args(ssh_options).join(' '),
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
@@ -99,6 +106,18 @@ module VagrantPlugins
           end
         end
 
+        # Generate a ssh(1) command line list of options
+        #
+        # @param [Array] options An array of ssh options. E.g.
+        #   `StrictHostKeyChecking=no` see ssh_config(5) for more
+        # @return [Array] Computed list of command line arguments
+        def ssh_options_to_args(options)
+          # Bail early if we get something that is not an array of options
+          return [] unless options
+
+          return options.map { |o| "-o '#{o}'" }
+        end
+
         private
 
         def ssh_key_options(ssh_info)

data/lib/vagrant-aws/config.rb

@@ -133,6 +133,17 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :ebs_optimized
 
+      # Assigning a public IP address in a VPC
+      #
+      # @return [Boolean]
+      attr_accessor :associate_public_ip
+
+      # The name of ELB, which an instance should be
+      # attached to
+      #
+      # @return [String]
+      attr_accessor :elb
+
       def initialize(region_specific=false)
         @access_key_id          = UNSET_VALUE
         @ami                    = UNSET_VALUE
@@ -158,6 +169,8 @@ module VagrantPlugins
         @ssh_host_attribute     = UNSET_VALUE
         @monitoring             = UNSET_VALUE
         @ebs_optimized          = UNSET_VALUE
+        @associate_public_ip    = UNSET_VALUE
+        @elb                    = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -214,7 +227,7 @@ module VagrantPlugins
           # has it.
           new_region_specific = other.instance_variable_get(:@__region_specific)
           result.instance_variable_set(
-            :@__region_specific, new_region_specific || @__region_specific)
+          :@__region_specific, new_region_specific || @__region_specific)
 
           # Go through all the region configs and prepend ours onto
           # theirs.
@@ -296,6 +309,12 @@ module VagrantPlugins
         # default false
         @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
+
         # Compile our region specific configurations only within
         # NON-REGION-SPECIFIC configurations.
         if !@__region_specific
@@ -338,7 +357,11 @@ module VagrantPlugins
               config.secret_access_key.nil?
           end
 
-          errors << I18n.t("vagrant_aws.config.ami_required") if config.ami.nil?
+          if config.associate_public_ip && !config.subnet_id
+            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?
         end
 
         { "AWS Provider" => errors }

data/lib/vagrant-aws/errors.rb

@@ -26,6 +26,10 @@ module VagrantPlugins
       class MkdirError < VagrantAWSError
         error_key(:mkdir_error)
       end
+
+      class ElbDoesNotExistError < VagrantAWSError
+        error_key("elb_does_not_exist")
+      end
     end
   end
 end

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

@@ -0,0 +1,56 @@
+module VagrantPlugins
+  module AWS
+    module ElasticLoadBalancer
+
+      def register_instance(env, elb_name, instance_id)
+        env[:ui].info I18n.t("vagrant_aws.elb.registering", instance_id: instance_id, elb_name: elb_name), :new_line => false
+        elb = get_load_balancer(env[:aws_elb], elb_name)
+        unless elb.instances.include? instance_id
+          elb.register_instances([instance_id])
+          env[:ui].info I18n.t("vagrant_aws.elb.ok"), :prefix => false
+          adjust_availability_zones env, elb
+        else
+          env[:ui].info I18n.t("vagrant_aws.elb.skipped"), :prefix => false
+        end
+      end
+
+      def deregister_instance(env, elb_name, instance_id)
+        env[:ui].info I18n.t("vagrant_aws.elb.deregistering", instance_id: instance_id, elb_name: elb_name), :new_line => false
+        elb = get_load_balancer(env[:aws_elb], elb_name)
+        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
+        else
+          env[:ui].info I18n.t("vagrant_aws.elb.skipped"), :prefix => false
+        end
+      end
+
+      def adjust_availability_zones(env, elb)
+        env[:ui].info I18n.t("vagrant_aws.elb.adjusting", elb_name: elb.id), :new_line => false
+
+        instances = env[:aws_compute].servers.all("instance-id" => elb.instances)
+        
+        azs = if instances.empty?
+                ["#{env[:machine].provider_config.region}a"]
+              else
+                instances.map(&:availability_zone).uniq
+              end
+
+        az_to_disable = elb.availability_zones - azs
+        az_to_enable = azs - elb.availability_zones
+
+        elb.enable_availability_zones az_to_enable unless az_to_enable.empty?
+        elb.disable_availability_zones az_to_disable unless az_to_disable.empty?
+
+        env[:ui].info I18n.t("vagrant_aws.elb.ok"), :prefix => false
+      end
+
+      private
+
+      def get_load_balancer(aws, name)
+        aws.load_balancers.find { |lb| lb.id == name } or raise Errors::ElbDoesNotExistError
+      end
+    end
+  end
+end

data/lib/vagrant-aws/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AWS
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/locales/en.yml

@@ -2,6 +2,18 @@ en:
   vagrant_aws:
     already_status: |-
       The machine is already %{status}.
+    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...
     launch_no_keypair: |-
@@ -46,13 +58,15 @@ en:
       access_key_id_required: |-
         An access key ID must be specified via "access_key_id"
       ami_required: |-
-        An AMI must be configured via "ami"
+        An AMI must be configured via "ami" (region: #{region})
       private_key_missing: |-
         The specified private key for AWS could not be found
       region_required: |-
         A region must be specified via "region"
       secret_access_key_required: |-
         A secret access key is required via "secret_access_key"
+      subnet_id_required_with_public_ip: |-
+        If you assign a public IP address to an instance in a VPC, a subnet must be specifed via "subnet_id"
 
     errors:
       fog_error: |-
@@ -72,7 +86,7 @@ en:
         Please verify that the machine properly boots. If you need more time
         set the `instance_ready_timeout` configuration on the AWS provider.
       rsync_error: |-
-        There was an error when attempting to rsync a share folder.
+        There was an error when attempting to rsync a shared folder.
         Please inspect the error message below for more info.
 
         Host path: %{hostpath}
@@ -84,6 +98,8 @@ en:
 
         Host path: %{hostpath}
         Error: %{err}
+      elb_does_not_exist: |-
+        ELB configured for the instance does not exist
 
     states:
       short_not_created: |-
@@ -99,7 +115,7 @@ en:
       short_stopping: |-
         stopping
       long_stopping: |-
-        The EC2 instance is stopping. Wait until is completely stopped to 
+        The EC2 instance is stopping. Wait until is completely stopped to
         run `vagrant up` and start it.
 
       short_pending: |-