Merge pull request #65 from bwhaley/master

Elastic IP for VPC instances per issue 18

Author: tralamazza

lib/vagrant-aws/action/read_ssh_info.rb

@@ -31,7 +31,7 @@ def read_ssh_info(aws, machine)
 
           # Read the DNS info
           return {
-            :host => server.dns_name || server.private_ip_address,
+            :host => server.public_ip_address || server.dns_name || server.private_ip_address,
             :port => 22
           }
         end

lib/vagrant-aws/action/run_instance.rb

@@ -1,4 +1,5 @@
 require "log4r"
+require 'json'
 
 require 'vagrant/util/retryable'
 
@@ -35,14 +36,15 @@ def call(env)
           tags                  = region_config.tags
           user_data             = region_config.user_data
           block_device_mapping  = region_config.block_device_mapping
+          elastic_ip         = region_config.elastic_ip
 
           # If there is no keypair then warn the user
           if !keypair
             env[:ui].warn(I18n.t("vagrant_aws.launch_no_keypair"))
           end
 
           # If there is a subnet ID then warn the user
-          if subnet_id
+          if subnet_id and !elastic_ip
             env[:ui].warn(I18n.t("vagrant_aws.launch_vpc_warning"))
           end
 
@@ -55,6 +57,7 @@ def call(env)
           env[:ui].info(" -- Keypair: #{keypair}") if keypair
           env[:ui].info(" -- Subnet ID: #{subnet_id}") if subnet_id
           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(" -- 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
@@ -120,6 +123,12 @@ def call(env)
 
           @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)
+          end
+
           if !env[:interrupted]
             env[:metrics]["instance_ssh_time"] = Util::Timer.time do
               # Wait for SSH to be ready.
@@ -153,6 +162,37 @@ def recover(env)
           end
         end
 
+        def do_elastic_ip(env, domain, server)
+            allocation = env[:aws_compute].allocate_address(domain)
+            if allocation.body['publicIp'].nil?
+              @logger.debug("Could not allocate Elastic IP.")
+              return nil
+            end
+            @logger.debug("Public IP #{allocation.body['publicIp']}")
+
+            # Associate the address and save the metadata to a hash
+            if domain == 'vpc'
+              # VPC requires an allocation ID to assign an IP
+              association = env[:aws_compute].associate_address(server.id, nil, nil, allocation.body['allocationId'])
+              h = { :allocation_id => allocation.body['allocationId'], :association_id => association.body['associationId'], :public_ip => allocation.body['publicIp'] }
+            else
+              # Standard EC2 instances only need the allocated IP address
+              association = env[:aws_compute].associate_address(server.id, allocation.body['publicIp'])
+              h = { :public_ip => allocation.body['publicIp'] }
+            end
+
+            unless association.body['return']
+              @logger.debug("Could not associate Elastic IP.")
+              return nil
+            end
+
+            # Save this IP to the data dir so it can be released when the instance is destroyed
+            ip_file = env[:machine].data_dir.join('elastic_ip')
+            ip_file.open('w+') do |f|
+              f.write(h.to_json)
+            end
+        end
+
         def terminate(env)
           destroy_env = env.dup
           destroy_env.delete(:interrupted)

lib/vagrant-aws/action/terminate_instance.rb

@@ -1,4 +1,5 @@
 require "log4r"
+require "json"
 
 module VagrantPlugins
   module AWS
@@ -17,9 +18,29 @@ def call(env)
           env[:ui].info(I18n.t("vagrant_aws.terminating"))
           server.destroy
           env[:machine].id = nil
+  
+          # 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
 
           @app.call(env)
         end
+
+        # Release an elastic IP address
+        def release_address(env,eip)
+          h = JSON.parse(eip)
+          # Use association_id and allocation_id for VPC, use public IP for EC2
+          if h['association_id']
+            env[:aws_compute].disassociate_address(nil,h['association_id'])
+            env[:aws_compute].release_address(h['allocation_id'])
+          else
+            env[:aws_compute].disassociate_address(h['public_ip'])
+            env[:aws_compute].release_address(h['public_ip'])
+          end
+        end
       end
     end
   end

lib/vagrant-aws/config.rb

@@ -39,6 +39,11 @@ class Config < Vagrant.plugin("2", :config)
       # @return [String]
       attr_accessor :private_ip_address
 
+      # Acquire and attach an elastic IP address (VPC).
+      #
+      # @return [Boolean]
+      attr_accessor :elastic_ip
+
       # The name of the AWS region in which to create the instance.
       #
       # @return [String]
@@ -106,6 +111,7 @@ def initialize(region_specific=false)
         @user_data              = UNSET_VALUE
         @use_iam_profile        = UNSET_VALUE
         @block_device_mapping   = {}
+        @elastic_ip         = UNSET_VALUE
 
         # Internal state (prefix with __ so they aren't automatically
         # merged)
@@ -196,6 +202,9 @@ def finalize!
         # Default the private IP to nil since VPC is not default
         @private_ip_address = nil if @private_ip_address == UNSET_VALUE
 
+        # Acquire an elastic IP if requested
+        @elastic_ip = nil if @elastic_ip == UNSET_VALUE
+
         # Default region is us-east-1. This is sensible because AWS
         # generally defaults to this as well.
         @region = "us-east-1" if @region == UNSET_VALUE

spec/vagrant-aws/config_spec.rb

@@ -30,6 +30,7 @@
     its("user_data")         { should be_nil }
     its("use_iam_profile")   { should be_false }
     its("block_device_mapping")  {should == {} }
+    its("elastic_ip")        { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -40,7 +41,7 @@
     [:access_key_id, :ami, :availability_zone, :instance_ready_timeout,
       :instance_type, :keypair_name,
       :region, :secret_access_key, :security_groups,
-      :subnet_id, :tags,
+      :subnet_id, :tags, :elastic_ip,
       :use_iam_profile, :user_data, :block_device_mapping].each do |attribute|
 
       it "should not default #{attribute} if overridden" do