bosh_openstack_cpi 1.3016.0 → 1.3022.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025e73f0033cb3d734e2281b75ac4153e3db3ae5
-  data.tar.gz: f66c0bbae2e9115c33d6e0bbce4e7f676583a47d
+  metadata.gz: fce52580bbf8ebe362d5ac6a5bd24d265c61604e
+  data.tar.gz: 20678c5e476b29b4f0f934530e3cdf5455d69f52
 SHA512:
-  metadata.gz: 0515b11c8c613aa444bbe56dc19f45d5784c350944e457bb057cf901eb6c9f7512991b44f00f9d9f3f80114d236b960464f2903ca57e1a166df97cb90ec4d907
-  data.tar.gz: f8847d8c6909d5ce0bc9c316955e7edc4cfe578308653c3e7435f54c144032b9800de4c68d38efeec0a2fde52f236f9a2876ebdebd909ef232c62ab4e4d6a97c
+  metadata.gz: 0426193fa3cd30fb97e79293bae060a73a31989faaad498e5bc105f8f91354d739edf1ae0711d6dc8127b8f9b847466385f4d8bbbb178e0d154b42db114edc48
+  data.tar.gz: f0efe00cb7da5a25493be3ee4d27789346f2c4edac5899f95fedda0661b12528efb3be6b8230699421175f78f939344ee6aec9f19a2b675beb764417a9e8a178

data/lib/cloud/openstack/cloud.rb

@@ -1,5 +1,4 @@
-# Copyright (c) 2009-2013 VMware, Inc.
-# Copyright (c) 2012 Piston Cloud Computing, Inc.
+require 'common/common'
 
 module Bosh::OpenStackCloud
   ##
@@ -7,11 +6,14 @@ module Bosh::OpenStackCloud
   class Cloud < Bosh::Cloud
     include Helpers
 
-    OPTION_KEYS = ['openstack', 'registry', 'agent']
+    OPTION_KEYS = ['openstack', 'registry', 'agent', 'use_dhcp']
 
     BOSH_APP_DIR = '/var/vcap/bosh'
     FIRST_DEVICE_NAME_LETTER = 'b'
 
+    CONNECT_RETRY_DELAY = 1
+    CONNECT_RETRY_COUNT = 5
+
     attr_reader :openstack
     attr_reader :registry
     attr_reader :glance
@@ -44,6 +46,7 @@ module Bosh::OpenStackCloud
       @wait_resource_poll_interval = @openstack_properties["wait_resource_poll_interval"]
       @boot_from_volume = @openstack_properties["boot_from_volume"]
       @boot_volume_cloud_properties = @openstack_properties["boot_volume_cloud_properties"] || {}
+      @use_dhcp = @openstack_properties.fetch('use_dhcp', true)
 
       unless @openstack_properties['auth_url'].match(/\/tokens$/)
         @openstack_properties['auth_url'] = @openstack_properties['auth_url'] + '/tokens'
@@ -63,10 +66,21 @@ module Bosh::OpenStackCloud
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
       }
+
+      connect_retry_errors = [Excon::Errors::GatewayTimeout]
+
+      connect_retry_options = {
+        sleep: CONNECT_RETRY_DELAY,
+        tries: CONNECT_RETRY_COUNT,
+        on: connect_retry_errors,
+      }
+
       begin
-        @openstack = Fog::Compute.new(openstack_params)
-      rescue Exception => e
-        @logger.error(e)
+        Bosh::Common.retryable(connect_retry_options) do |tries, error|
+          @logger.error("Failed #{tries} times, last failure due to: #{error.inspect}") unless error.nil?
+          @openstack = Fog::Compute.new(openstack_params)
+        end
+      rescue Bosh::Common::RetryCountExceeded, Excon::Errors::ClientError, Excon::Errors::ServerError
         cloud_error('Unable to connect to the OpenStack Compute API. Check task debug log for details.')
       end
 
@@ -84,10 +98,13 @@ module Bosh::OpenStackCloud
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
       }
+
       begin
-        @glance = Fog::Image.new(glance_params)
-      rescue Exception => e
-        @logger.error(e)
+        Bosh::Common.retryable(connect_retry_options) do |tries, error|
+          @logger.error("Failed #{tries} times, last failure due to: #{error.inspect}") unless error.nil?
+          @glance = Fog::Image.new(glance_params)
+        end
+      rescue Bosh::Common::RetryCountExceeded, Excon::Errors::ClientError, Excon::Errors::ServerError
         cloud_error('Unable to connect to the OpenStack Image Service API. Check task debug log for details.')
       end
 
@@ -101,11 +118,14 @@ module Bosh::OpenStackCloud
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
         :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
       }
+
       begin
-        @volume = Fog::Volume.new(volume_params)
-      rescue Exception => e
-        @logger.error(e)
-        cloud_error("Unable to connect to the OpenStack Volume API. Check task debug log for details.")
+        Bosh::Common.retryable(connect_retry_options) do |tries, error|
+          @logger.error("Failed #{tries} times, last failure due to: #{error.inspect}") unless error.nil?
+          @volume = Fog::Volume.new(volume_params)
+        end
+      rescue Bosh::Common::RetryCountExceeded, Excon::Errors::ClientError, Excon::Errors::ServerError
+        cloud_error('Unable to connect to the OpenStack Volume API. Check task debug log for details.')
       end
 
       @metadata_lock = Mutex.new
@@ -300,7 +320,7 @@ module Bosh::OpenStackCloud
 
           @logger.info("Configuring network for server `#{server.id}'...")
           network_configurator.configure(@openstack, server)
-        rescue Bosh::Clouds::CloudError => e
+        rescue => e
           @logger.warn("Failed to create server: #{e.message}")
           destroy_server(server)
           raise Bosh::Clouds::VMCreationFailed.new(true), e.message
@@ -311,7 +331,7 @@ module Bosh::OpenStackCloud
           settings = initial_agent_settings(server_name, agent_id, network_spec, environment,
                                             flavor_has_ephemeral_disk?(flavor))
           @registry.update_settings(server.name, settings)
-        rescue Bosh::Clouds::CloudError => e
+        rescue => e
           @logger.warn("Failed to register server: #{e.message}")
           destroy_server(server)
           raise Bosh::Clouds::VMCreationFailed.new(false), e.message
@@ -391,7 +411,7 @@ module Bosh::OpenStackCloud
         network_configurator.configure(@openstack, server)
 
         update_agent_settings(server) do |settings|
-          settings['networks'] = network_spec
+          settings['networks'] = agent_network_spec(network_spec)
         end
       end
     end
@@ -656,7 +676,7 @@ module Bosh::OpenStackCloud
       data['registry'] = { 'endpoint' => @registry.endpoint }
       data['server'] = { 'name' => server_name }
       data['openssh'] = { 'public_key' => public_key } if public_key
-      data['networks'] = network_spec
+      data['networks'] = agent_network_spec(network_spec)
 
       with_dns(network_spec) do |servers|
         data['dns'] = { 'nameserver' => servers }
@@ -701,7 +721,7 @@ module Bosh::OpenStackCloud
           'name' => server_name
         },
         'agent_id' => agent_id,
-        'networks' => network_spec,
+        'networks' => agent_network_spec(network_spec),
         'disks' => {
           'system' => '/dev/sda',
           'persistent' => {}
@@ -713,6 +733,13 @@ module Bosh::OpenStackCloud
       settings.merge(@agent_properties)
     end
 
+    def agent_network_spec(network_spec)
+      Hash[*network_spec.map do |name, settings|
+        settings['use_dhcp'] = @use_dhcp
+        [name, settings]
+      end.flatten]
+    end
+
     ##
     # Updates the agent settings
     #

data/lib/cloud/openstack/helpers.rb

@@ -24,6 +24,7 @@ module Bosh::OpenStackCloud
       retries = 0
       begin
         yield
+
       rescue Excon::Errors::RequestEntityTooLarge => e
         # If we find a rate limit error, parse message, wait, and retry
         overlimit = parse_openstack_response(e.response, "overLimit", "overLimitFault")
@@ -37,10 +38,21 @@ module Bosh::OpenStackCloud
           retry
         end
         cloud_error("OpenStack API Request Entity Too Large error. Check task debug log for details.", e)
+
+      rescue Excon::Errors::ServiceUnavailable => e
+        unless retries >= MAX_RETRIES
+          retries += 1
+          @logger.debug("OpenStack API Service Unavailable error, retrying (#{retries})") if @logger
+          sleep(DEFAULT_RETRY_TIMEOUT)
+          retry
+        end
+        cloud_error("OpenStack API Service Unavailable error. Check task debug log for details.", e)
+
       rescue Excon::Errors::BadRequest => e
         badrequest = parse_openstack_response(e.response, "badRequest")
-        details = badrequest.nil? ? "" : " (#{badrequest["message"]})"   
+        details = badrequest.nil? ? "" : " (#{badrequest["message"]})"
         cloud_error("OpenStack API Bad Request#{details}. Check task debug log for details.", e)
+
       rescue Excon::Errors::InternalServerError => e
         unless retries >= MAX_RETRIES
           retries += 1
@@ -51,9 +63,9 @@ module Bosh::OpenStackCloud
         cloud_error("OpenStack API Internal Server error. Check task debug log for details.", e)
       end
     end
-    
+
     ##
-    # Parses and look ups for keys in an OpenStack response 
+    # Parses and look ups for keys in an OpenStack response
     #
     # @param [Excon::Response] response Response from OpenStack API
     # @param [Array<String>] keys Keys to look up in response
@@ -120,7 +132,7 @@ module Bosh::OpenStackCloud
         break if target_state.include?(state)
 
         sleep(@wait_resource_poll_interval)
-        
+
       end
 
       if @logger

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.3016.0'
+    VERSION = '1.3022.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3016.0
+  version: 1.3022.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3016.0
+        version: 1.3022.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH OpenStack CPI
-  10557b
+  6073a7
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console