Elastic ip modifications

Author: Madhurranjan Mohaan

lib/vagrant-aws/action/run_instance.rb

@@ -37,6 +37,7 @@ def call(env)
           user_data             = region_config.user_data
           block_device_mapping  = region_config.block_device_mapping
           elastic_ip            = region_config.elastic_ip
+          allocate_elastic_ip   = region_config.allocate_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
@@ -47,7 +48,7 @@ def call(env)
           end
 
           # If there is a subnet ID then warn the user
-          if subnet_id && !elastic_ip
+          if subnet_id and not elastic_ip and not allocate_elastic_ip
             env[:ui].warn(I18n.t("vagrant_aws.launch_vpc_warning"))
           end
 
@@ -62,7 +63,8 @@ def call(env)
           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.inspect}") if elastic_ip
+          env[:ui].info(" -- Allocate Elastic IP: #{allocate_elastic_ip.inspect}") if allocate_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
@@ -80,6 +82,8 @@ def call(env)
             :iam_instance_profile_name => iam_instance_profile_name,
             :tags                      => tags,
             :user_data                 => user_data,
+            :elastic_ip                => elastic_ip,
+            :allocate_elastic_ip       => allocate_elastic_ip,
             :block_device_mapping      => block_device_mapping,
             :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil
           }
@@ -138,9 +142,14 @@ 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 elastic_ip
-            domain = subnet_id ? 'vpc' : 'standard'
-            do_elastic_ip(env, domain, server)
+            associate_elastic_ip(env,elastic_ip)
+          elsif allocate_elastic_ip
+            allocate_and_associate_elastic_ip(env,allocate_elastic_ip)
           end
 
           if !env[:interrupted]
@@ -232,6 +241,47 @@ def terminate(env)
           destroy_env[:force_confirm_destroy] = true
           env[:action_runner].run(Action.action_destroy, destroy_env)
         end
+
+        def associate_elastic_ip(env,elastic_ip)
+          begin
+            eip = env[:aws_compute].addresses.get(elastic_ip)
+            if eip.nil?
+              terminate(env)
+              raise Errors::FogError,
+                :message => "Elastic IP specified not found: #{elastic_ip}"
+            end
+            @logger.info("eip - #{eip}")
+            env[:aws_compute].associate_address(env[:machine].id,nil,nil,eip.allocation_id)
+            env[:ui].info(I18n.t("vagrant_aws.elastic_ip_allocated"))
+          rescue Fog::Compute::AWS::NotFound => e
+          # Invalid elasticip doesn't have its own error so we catch and
+          # check the error message here.
+            if e.message =~ /Elastic IP/
+              terminate(env)
+              raise Errors::FogError,
+                :message => "Elastic IP not found: #{elastic_ip}"
+            end
+            raise
+          end
+        end
+
+        def allocate_and_associate_elastic_ip(env,allocate_elastic_ip)
+          begin
+            allocated_eip = env[:aws_compute].allocate_address(allocate_elastic_ip)
+            associate_elastic_ip(env,allocated_eip[:body]["publicIp"])
+          rescue Fog::Compute::AWS::NotFound => e
+            # Invalid computation of elasticip doesn't have its own error so we catch and
+            # check the error message here.
+            if e.message =~ /Elastic IP/
+              terminate(env)
+              raise Errors::FogError,
+                :message => "Elastic IP not allocated with allocate_elastic_ip option: #{allocate_elastic_ip}"
+            end
+            raise
+          end
+        end
+
+
       end
     end
   end

lib/vagrant-aws/action/terminate_instance.rb

@@ -17,14 +17,19 @@ def call(env)
           # Destroy the server and remove the tracking ID
           env[:ui].info(I18n.t("vagrant_aws.terminating"))
           server.destroy
+          elastic_ip = env[:aws_compute].describe_addresses('public-ip' => server.public_ip_address)
+          if !elastic_ip[:body]["addressesSet"].empty?
+            env[:aws_compute].disassociate_address(nil,elastic_ip[:body]["addressesSet"][0]["associationId"]) if !elastic_ip[:body]["addressesSet"].empty?
+            env[:ui].info(I18n.t("vagrant_aws.elastic_ip_deallocated"))
+          end
           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
+          #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

lib/vagrant-aws/config.rb

@@ -41,9 +41,14 @@ class Config < Vagrant.plugin("2", :config)
 
       # Acquire and attach an elastic IP address (VPC).
       #
-      # @return [Boolean]
+      # @return [String]
       attr_accessor :elastic_ip
 
+      # Allocate Elastic IP 
+      # 
+      # @return [String]
+      attr_accessor :allocate_elastic_ip
+      
       # The name of the AWS region in which to create the instance.
       #
       # @return [String]
@@ -142,6 +147,7 @@ def initialize(region_specific=false)
         @use_iam_profile        = UNSET_VALUE
         @block_device_mapping   = []
         @elastic_ip             = UNSET_VALUE
+        @allocate_elastic_ip    = UNSET_VALUE
         @iam_instance_profile_arn  = UNSET_VALUE
         @iam_instance_profile_name = UNSET_VALUE
         @terminate_on_shutdown  = UNSET_VALUE
@@ -240,9 +246,12 @@ 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
+        # Acquire an elastic IP if requested ; This is the case where eip has to be explicitly allocated
         @elastic_ip = nil if @elastic_ip == UNSET_VALUE
 
+        # Allocate Elastic ip is nil by default
+        @allocate_elastic_ip = nil if @allocate_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