bosh_aws_cpi 1.2652.0 → 1.2657.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16fa136873ef1c5afd91bd2a6afed01422320639
-  data.tar.gz: ad15b66bf0ae287aea2a64d7a8bcb221dd9408cb
+  metadata.gz: de2813b880f8bd8f982bc621d778f0107b8e0059
+  data.tar.gz: 740352254379a1afd8566fa9ce725316e12c4464
 SHA512:
-  metadata.gz: 0e53dc52949f467b740f8d7dbd51a7de87fc99cc5bb28399f8fbd672caaf8e3b07a929acb882e3fdb70849f9e06ee8c924fd558d4bdbd8adf453776fd9122011
-  data.tar.gz: 868b9a3e5c677b7e4dc95ad5d6daa87dcb664b65b2cda73e49bb0425888d841425d2e01250de0623e8d416f3d3f56e1b0b91f1d5bbf963b9d415e83f417d949e
+  metadata.gz: ac882c156c0793a3083cb00b81e849bb10725cfbbf614500de7dd0b41a47a847c1d5dceac7cb436f37b465673111e576fe6db0e73a660d435a344c29d36d258b
+  data.tar.gz: 3920789f8cc8f2110afcd514f0d32a367c556f68bac8e3a1b4d83bd084433f93e879db324faab50141c41bf77ae39a3fa3e85553ba0961b6a08a2381e9c7d081

data/lib/cloud/aws/cloud.rb

@@ -31,6 +31,10 @@ module Bosh::AwsCloud
       initialize_aws
       initialize_registry
 
+      elb = AWS::ELB.new
+
+      @instance_manager = InstanceManager.new(region, registry, elb, az_selector, @logger)
+
       @metadata_lock = Mutex.new
     end
 
@@ -84,26 +88,32 @@ module Bosh::AwsCloud
         stemcell = StemcellFinder.find_by_region_and_id(region, stemcell_id)
 
         begin
-          instance_manager = InstanceManager.new(region, registry, az_selector)
-          instance = instance_manager.
-              create(agent_id, stemcell.image_id, resource_pool, network_spec, (disk_locality || []), environment, options)
+          instance = @instance_manager.create(
+            agent_id,
+            stemcell.image_id,
+            resource_pool,
+            network_spec,
+            (disk_locality || []),
+            environment,
+            options,
+          )
 
           logger.info("Creating new instance '#{instance.id}'")
 
           NetworkConfigurator.new(network_spec).configure(region, instance)
 
           registry_settings = initial_agent_settings(
-              agent_id,
-              network_spec,
-              environment,
-              stemcell.root_device_name,
+            agent_id,
+            network_spec,
+            environment,
+            stemcell.root_device_name,
           )
           registry.update_settings(instance.id, registry_settings)
 
           instance.id
         rescue => e # is this rescuing too much?
           logger.error(%Q[Failed to create instance: #{e.message}\n#{e.backtrace.join("\n")}])
-          instance_manager.terminate(instance.id, fast_path_delete?) if instance
+          instance.terminate(fast_path_delete?) if instance
           raise e
         end
       end
@@ -124,7 +134,7 @@ module Bosh::AwsCloud
     def delete_vm(instance_id)
       with_thread_name("delete_vm(#{instance_id})") do
         logger.info("Deleting instance '#{instance_id}'")
-        InstanceManager.new(region, registry).terminate(instance_id, fast_path_delete?)
+        @instance_manager.find(instance_id).terminate(fast_path_delete?)
       end
     end
 
@@ -133,7 +143,7 @@ module Bosh::AwsCloud
     # @param [String] instance_id EC2 instance id
     def reboot_vm(instance_id)
       with_thread_name("reboot_vm(#{instance_id})") do
-        InstanceManager.new(region, registry).reboot(instance_id)
+        @instance_manager.find(instance_id).reboot
       end
     end
 
@@ -142,7 +152,7 @@ module Bosh::AwsCloud
     # @param [String] instance_id EC2 instance id
     def has_vm?(instance_id)
       with_thread_name("has_vm?(#{instance_id})") do
-        InstanceManager.new(region, registry).has_instance?(instance_id)
+        @instance_manager.find(instance_id).exists?
       end
     end
 

data/lib/cloud/aws/instance.rb

@@ -0,0 +1,102 @@
+module Bosh::AwsCloud
+  class Instance
+    def initialize(aws_instance, registry, elb, logger)
+      @aws_instance = aws_instance
+      @registry = registry
+      @elb = elb
+      @logger = logger
+    end
+
+    def id
+      @aws_instance.id
+    end
+
+    def elastic_ip
+      @aws_instance.elastic_ip
+    end
+
+    def associate_elastic_ip(elastic_ip)
+      @aws_instance.associate_elastic_ip(elastic_ip)
+    end
+
+    def disassociate_elastic_ip
+      @aws_instance.disassociate_elastic_ip
+    end
+
+    def wait_for_running
+      # If we time out, it is because the instance never gets from state running to started,
+      # so we signal the director that it is ok to retry the operation. At the moment this
+      # forever (until the operation is cancelled by the user).
+      begin
+        @logger.info("Waiting for instance to be ready...")
+        ResourceWait.for_instance(instance: @aws_instance, state: :running)
+      rescue Bosh::Common::RetryCountExceeded
+        @logger.warn("Timed out waiting for instance '#{aws_instance.id}' to be running")
+        raise Bosh::Clouds::VMCreationFailed.new(true)
+      end
+    end
+
+    # Soft reboots EC2 instance
+    def reboot
+      # There is no trackable status change for the instance being
+      # rebooted, so it's up to CPI client to keep track of agent
+      # being ready after reboot.
+      # Due to this, we can't deregister the instance from any load
+      # balancers it might be attached to, and reattach once the
+      # reboot is complete, so we just have to let the load balancers
+      # take the instance out of rotation, and put it back in once it
+      # is back up again.
+      @aws_instance.reboot
+    end
+
+    def terminate(fast=false)
+      remove_from_load_balancers
+
+      begin
+        @aws_instance.terminate
+      rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
+        @logger.warn("Failed to terminate instance '#{@aws_instance.id}' because it was not found: #{e.inspect}")
+        raise Bosh::Clouds::VMNotFound, "VM `#{@aws_instance.id}' not found"
+      ensure
+        @logger.info("Deleting instance settings for '#{@aws_instance.id}'")
+        @registry.delete_settings(@aws_instance.id)
+      end
+
+      if fast
+        TagManager.tag(@aws_instance, "Name", "to be deleted")
+        @logger.info("Instance #{@aws_instance.id} marked to deletion")
+        return
+      end
+
+      begin
+        @logger.info("Deleting instance '#{@aws_instance.id}'")
+        ResourceWait.for_instance(instance: @aws_instance, state: :terminated)
+      rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
+        @logger.debug("Failed to find terminated instance '#{@aws_instance.id}' after deletion: #{e.inspect}")
+        # It's OK, just means that instance has already been deleted
+      end
+    end
+
+    # Determines if the instance exists.
+    def exists?
+      @aws_instance.exists? && @aws_instance.status != :terminated
+    end
+
+    def attach_to_load_balancers(load_balancer_ids)
+      load_balancer_ids.each do |load_balancer_id|
+        lb = @elb.load_balancers[load_balancer_id]
+        lb.instances.register(@aws_instance)
+      end
+    end
+
+    def remove_from_load_balancers
+      @elb.load_balancers.each do |load_balancer|
+        begin
+          load_balancer.instances.deregister(@aws_instance)
+        rescue AWS::ELB::Errors::InvalidInstance
+          # ignore this, as it just means it wasn't registered
+        end
+      end
+    end
+  end
+end

data/lib/cloud/aws/instance_manager.rb

@@ -5,37 +5,38 @@ module Bosh::AwsCloud
   class InstanceManager
     include Helpers
 
-    attr_reader :instance
-    attr_reader :instance_params
-    attr_reader :elbs
-
-    def initialize(region, registry, az_selector=nil)
+    def initialize(region, registry, elb, az_selector, logger)
       @region = region
       @registry = registry
-      @logger = Bosh::Clouds::Config.logger
+      @elb = elb
       @az_selector = az_selector
-      @instance_params = {count: 1}
+      @logger = logger
     end
 
     def create(agent_id, stemcell_id, resource_pool, networks_spec, disk_locality, environment, options)
-      @instance_params[:image_id] = stemcell_id
-      @instance_params[:instance_type] = resource_pool["instance_type"]
-      set_user_data_parameter(networks_spec)
-      set_key_name_parameter(resource_pool["key_name"], options["aws"]["default_key_name"])
-      set_security_groups_parameter(networks_spec, options["aws"]["default_security_groups"])
-      set_vpc_parameters(networks_spec)
+      instance_params = {count: 1}
+      instance_params[:image_id] = stemcell_id
+      instance_params[:instance_type] = resource_pool["instance_type"]
+
+      set_user_data_parameter(instance_params, networks_spec)
+      set_key_name_parameter(instance_params, resource_pool["key_name"], options["aws"]["default_key_name"])
+      set_security_groups_parameter(instance_params, networks_spec, options["aws"]["default_security_groups"])
+      set_vpc_parameters(instance_params, networks_spec)
+
       set_availability_zone_parameter(
-          (disk_locality || []).map { |volume_id| @region.volumes[volume_id].availability_zone.to_s },
-          resource_pool["availability_zone"],
-          (@instance_params[:subnet].availability_zone_name if @instance_params[:subnet])
+        instance_params,
+        (disk_locality || []).map { |volume_id| @region.volumes[volume_id].availability_zone.to_s },
+        resource_pool["availability_zone"],
+        (instance_params[:subnet].availability_zone_name if instance_params[:subnet])
       )
-      
+
       @logger.info("Creating new instance with: #{instance_params.inspect}")
-      
+
+      aws_instance = nil
       if resource_pool["spot_bid_price"]
         @logger.info("Launching spot instance...")
         spot_manager = Bosh::AwsCloud::SpotManager.new(@region)
-        @instance = spot_manager.create(instance_params, resource_pool["spot_bid_price"])
+        aws_instance = spot_manager.create(instance_params, resource_pool["spot_bid_price"])
       else
         # Retry the create instance operation a couple of times if we are told that the IP
         # address is in use - it can happen when the director recreates a VM and AWS
@@ -43,111 +44,43 @@ module Bosh::AwsCloud
         # realocate it again.
         errors = [AWS::EC2::Errors::InvalidIPAddress::InUse]
         Bosh::Common.retryable(sleep: instance_create_wait_time, tries: 10, on: errors) do |tries, error|
-          @logger.info("Launching on demand instance...") 
+          @logger.info("Launching on demand instance...")
           @logger.warn("IP address was in use: #{error}") if tries > 0
-          @instance = @region.instances.create(instance_params)
+          aws_instance = @region.instances.create(instance_params)
         end
-      end 
-
-      # We need to wait here for the instance to be running, as if we are going to
-      # attach to a load balancer, the instance must be running.
-      # If we time out, it is because the instance never gets from state running to started,
-      # so we signal the director that it is ok to retry the operation. At the moment this
-      # forever (until the operation is cancelled by the user).
-      begin
-        @logger.info("Waiting for instance to be ready...") 
-        ResourceWait.for_instance(instance: instance, state: :running)
-      rescue Bosh::Common::RetryCountExceeded => e
-        @logger.warn("timed out waiting for #{instance.id} to be running")
-        raise Bosh::Clouds::VMCreationFailed.new(true)
-      end
-
-      @elbs = resource_pool['elbs']
-      attach_to_load_balancers if elbs
-
-      instance
-    end
-
-    def terminate(instance_id, fast=false)
-      @instance = @region.instances[instance_id]
-
-      remove_from_load_balancers
-
-      begin
-        instance.terminate
-      rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
-        @logger.info("Failed to terminate instance because it was not found: #{e.inspect}")
-        raise Bosh::Clouds::VMNotFound, "VM `#{instance_id}' not found"
-      ensure
-        @logger.info("Deleting instance settings for '#{instance_id}'")
-        @registry.delete_settings(instance_id)
       end
 
-      if fast
-        TagManager.tag(instance, "Name", "to be deleted")
-        @logger.info("Instance #{instance_id} marked to deletion")
-        return
-      end
+      instance = Instance.new(aws_instance, @registry, @elb, @logger)
 
       begin
-        @logger.info("Deleting instance '#{instance.id}'")
-        ResourceWait.for_instance(instance: instance, state: :terminated)
-      rescue AWS::EC2::Errors::InvalidInstanceID::NotFound
-        # It's OK, just means that instance has already been deleted
+        # We need to wait here for the instance to be running, as if we are going to
+        # attach to a load balancer, the instance must be running.
+        instance.wait_for_running
+        instance.attach_to_load_balancers(resource_pool['elbs'] || [])
+      rescue => e
+        @logger.warn("Failed to configure instance '#{instance.id}': #{e.inspect}")
+        begin
+          instance.terminate
+        rescue => e
+          @logger.error("Failed to terminate mis-configured instance '#{instance.id}': #{e.inspect}")
+        end
+        raise
       end
-    end
-
-    # Soft reboots EC2 instance
-    # @param [String] instance_id EC2 instance id
-    def reboot(instance_id)
-      instance = @region.instances[instance_id]
-
-      # There is no trackable status change for the instance being
-      # rebooted, so it's up to CPI client to keep track of agent
-      # being ready after reboot.
-      # Due to this, we can't deregister the instance from any load
-      # balancers it might be attached to, and reattach once the
-      # reboot is complete, so we just have to let the load balancers
-      # take the instance out of rotation, and put it back in once it
-      # is back up again.
-      instance.reboot
-    end
 
-    def attach_to_load_balancers
-      elb = AWS::ELB.new
-
-      elbs.each do |load_balancer|
-        lb = elb.load_balancers[load_balancer]
-        lb.instances.register(instance)
-      end
+      instance
     end
 
-    # Determines if the instance exists.
     # @param [String] instance_id EC2 instance id
-    def has_instance?(instance_id)
-      instance = @region.instances[instance_id]
-
-      instance.exists? && instance.status != :terminated
+    def find(instance_id)
+      Instance.new(@region.instances[instance_id], @registry, @elb, @logger)
     end
 
-    def remove_from_load_balancers
-      elb = AWS::ELB.new
-
-      elb.load_balancers.each do |load_balancer|
-        begin
-          load_balancer.instances.deregister(instance)
-        rescue AWS::ELB::Errors::InvalidInstance
-          # ignore this, as it just means it wasn't registered
-        end
-      end
-    end
-
-    def set_key_name_parameter(resource_pool_key_name, default_aws_key_name)
+    def set_key_name_parameter(instance_params, resource_pool_key_name, default_aws_key_name)
       key_name = resource_pool_key_name || default_aws_key_name
       instance_params[:key_name] = key_name unless key_name.nil?
     end
 
-    def set_security_groups_parameter(networks_spec, default_security_groups)
+    def set_security_groups_parameter(instance_params, networks_spec, default_security_groups)
       security_group_names = extract_security_group_names(networks_spec)
       if security_group_names.empty?
         instance_params[:security_groups] = default_security_groups
@@ -156,33 +89,33 @@ module Bosh::AwsCloud
       end
     end
 
-    def set_vpc_parameters(network_spec)
+    def set_vpc_parameters(instance_params, network_spec)
       manual_network_spec = network_spec.values.select { |spec| ["manual", nil].include? spec["type"] }.first
       if manual_network_spec
         instance_params[:private_ip_address] = manual_network_spec["ip"]
       end
-      
-      subnet_network_spec = network_spec.values.select { |spec| 
-        ["manual", nil, "dynamic"].include?(spec["type"]) && 
+
+      subnet_network_spec = network_spec.values.select { |spec|
+        ["manual", nil, "dynamic"].include?(spec["type"]) &&
         spec.fetch("cloud_properties", {}).has_key?("subnet")
       }.first
       if subnet_network_spec
           instance_params[:subnet] = @region.subnets[subnet_network_spec["cloud_properties"]["subnet"]]
-      end      
+      end
     end
 
-    def set_availability_zone_parameter(volume_zones, resource_pool_zone, subnet_zone)
+    def set_availability_zone_parameter(instance_params, volume_zones, resource_pool_zone, subnet_zone)
       availability_zone = @az_selector.common_availability_zone(volume_zones, resource_pool_zone, subnet_zone)
       instance_params[:availability_zone] = availability_zone if availability_zone
     end
 
-    def set_user_data_parameter(networks_spec)
+    def set_user_data_parameter(instance_params, networks_spec)
       user_data = {registry: {endpoint: @registry.endpoint}}
 
       spec_with_dns = networks_spec.values.select { |spec| spec.has_key? "dns" }.first
       user_data[:dns] = {nameserver: spec_with_dns["dns"]} if spec_with_dns
 
-      @instance_params[:user_data] = Yajl::Encoder.encode(user_data)
+      instance_params[:user_data] = Yajl::Encoder.encode(user_data)
     end
 
     private

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2652.0'
+    VERSION = '1.2657.0'
   end
 end

data/lib/cloud/aws.rb

@@ -32,6 +32,7 @@ require "cloud/aws/dynamic_network"
 require "cloud/aws/manual_network"
 require "cloud/aws/vip_network"
 require "cloud/aws/instance_manager"
+require "cloud/aws/instance"
 require "cloud/aws/spot_manager"
 require "cloud/aws/tag_manager"
 require "cloud/aws/availability_zone_selector"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2652.0
+  version: 1.2657.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2652.0
+        version: 1.2657.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: 0.8.2
 description: |-
   BOSH AWS CPI
-  43d2e8
+  a6c527
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console
@@ -112,6 +112,7 @@ files:
 - lib/cloud/aws/cloud.rb
 - lib/cloud/aws/dynamic_network.rb
 - lib/cloud/aws/helpers.rb
+- lib/cloud/aws/instance.rb
 - lib/cloud/aws/instance_manager.rb
 - lib/cloud/aws/light_stemcell.rb
 - lib/cloud/aws/manual_network.rb