bosh_openstack_cpi 1.3033.0 → 1.3039.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ab5fe9e7caf41ec33a35feaf98e064e1248a071
-  data.tar.gz: 4025247388ddde917d8905534720e6a0590cab30
+  metadata.gz: a4b4be6f3273b4e67b919cc550a49fd54a43fdc1
+  data.tar.gz: 3a04b00f00665a402df33090333755eec6ad8a9a
 SHA512:
-  metadata.gz: a94fcbcf29f1b9944a3d6b1fae6e49b46602ed3cd9140ffc5ee0ab69ec4b4400d91a3177ee893caaf3df426c99b4b11435591979f720a477cf296ff2157f0572
-  data.tar.gz: 13f3fd4b825878c6b198721fdb2a21bb071078017e5d945d89cc3f02468c2115fdb084a34fb1e887bd9c9ebc5b55f42cd2492de99b24754a2fb20856c629d6f6
+  metadata.gz: 751948c5de3e5eba400a1b1e6b8406f5aec0b58a3f8b6b3c38cdb59d756cddeef75bb7f36e5fee833b7275f16d5fe64a51a0f166220fa73e1c728418f11fd63e
+  data.tar.gz: 43498578e3f1e5c00420828e7574d6ed4b1ddd58f8a942821395660d700be0030fc04612c105abd197e07630caa1821108e017a0a729eb0ae7c4639a081bfba6

data/lib/cloud/openstack/cloud.rb

@@ -54,7 +54,7 @@ module Bosh::OpenStackCloud
 
       @openstack_properties['connection_options'] ||= {}
 
-      extra_connection_options = {'instrumentor' => Bosh::OpenStackCloud::ExconLoggingInstrumentor}
+      @extra_connection_options = {'instrumentor' => Bosh::OpenStackCloud::ExconLoggingInstrumentor}
 
       openstack_params = {
         :provider => 'OpenStack',
@@ -64,19 +64,19 @@ module Bosh::OpenStackCloud
         :openstack_tenant => @openstack_properties['tenant'],
         :openstack_region => @openstack_properties['region'],
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
-        :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
+        :connection_options => @openstack_properties['connection_options'].merge(@extra_connection_options)
       }
 
       connect_retry_errors = [Excon::Errors::GatewayTimeout]
 
-      connect_retry_options = {
+      @connect_retry_options = {
         sleep: CONNECT_RETRY_DELAY,
         tries: CONNECT_RETRY_COUNT,
         on: connect_retry_errors,
       }
 
       begin
-        Bosh::Common.retryable(connect_retry_options) do |tries, error|
+        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
@@ -96,11 +96,11 @@ module Bosh::OpenStackCloud
         :openstack_tenant => @openstack_properties['tenant'],
         :openstack_region => @openstack_properties['region'],
         :openstack_endpoint_type => @openstack_properties['endpoint_type'],
-        :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
+        :connection_options => @openstack_properties['connection_options'].merge(@extra_connection_options)
       }
 
       begin
-        Bosh::Common.retryable(connect_retry_options) do |tries, error|
+        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
@@ -108,26 +108,6 @@ module Bosh::OpenStackCloud
         cloud_error('Unable to connect to the OpenStack Image Service API. Check task debug log for details.')
       end
 
-      volume_params = {
-        :provider => "OpenStack",
-        :openstack_auth_url => @openstack_properties['auth_url'],
-        :openstack_username => @openstack_properties['username'],
-        :openstack_api_key => @openstack_properties['api_key'],
-        :openstack_tenant => @openstack_properties['tenant'],
-        :openstack_region => @openstack_properties['region'],
-        :openstack_endpoint_type => @openstack_properties['endpoint_type'],
-        :connection_options => @openstack_properties['connection_options'].merge(extra_connection_options)
-      }
-
-      begin
-        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
     end
 
@@ -424,6 +404,7 @@ module Bosh::OpenStackCloud
     #   this disk will be attached to
     # @return [String] OpenStack volume UUID
     def create_disk(size, cloud_properties, server_id = nil)
+      volume_service_client = connect_to_volume_service
       with_thread_name("create_disk(#{size}, #{cloud_properties}, #{server_id})") do
         raise ArgumentError, 'Disk size needs to be an integer' unless size.kind_of?(Integer)
         cloud_error('Minimum disk size is 1 GiB') if (size < 1024)
@@ -446,7 +427,7 @@ module Bosh::OpenStackCloud
         end
 
         @logger.info('Creating new volume...')
-        new_volume = with_openstack { @volume.volumes.create(volume_params) }
+        new_volume = with_openstack { volume_service_client.volumes.create(volume_params) }
 
         @logger.info("Creating new volume `#{new_volume.id}'...")
         wait_resource(new_volume, :available)
@@ -465,6 +446,7 @@ module Bosh::OpenStackCloud
     # @param [optional, String] volume_type to be passed to the volume API
     # @return [String] OpenStack volume UUID
     def create_boot_disk(size, stemcell_id, availability_zone = nil, boot_volume_cloud_properties = {})
+      volume_service_client = connect_to_volume_service
       with_thread_name("create_boot_disk(#{size}, #{stemcell_id}, #{availability_zone}, #{boot_volume_cloud_properties})") do
         raise ArgumentError, "Disk size needs to be an integer" unless size.kind_of?(Integer)
         cloud_error("Minimum disk size is 1 GiB") if (size < 1024)
@@ -481,7 +463,7 @@ module Bosh::OpenStackCloud
         volume_params[:volume_type] = boot_volume_cloud_properties["type"] if boot_volume_cloud_properties["type"]
 
         @logger.info("Creating new boot volume...")
-        boot_volume = with_openstack { @volume.volumes.create(volume_params) }
+        boot_volume = with_openstack { volume_service_client.volumes.create(volume_params) }
 
         @logger.info("Creating new boot volume `#{boot_volume.id}'...")
         wait_resource(boot_volume, :available)
@@ -656,6 +638,35 @@ module Bosh::OpenStackCloud
 
     private
 
+    ##
+    # Creates a client for the OpenStack volume service, or return
+    # the existing connectuion
+    #
+    #
+    def connect_to_volume_service
+      volume_params = {
+        :provider => "OpenStack",
+        :openstack_auth_url => @openstack_properties['auth_url'],
+        :openstack_username => @openstack_properties['username'],
+        :openstack_api_key => @openstack_properties['api_key'],
+        :openstack_tenant => @openstack_properties['tenant'],
+        :openstack_region => @openstack_properties['region'],
+        :openstack_endpoint_type => @openstack_properties['endpoint_type'],
+        :connection_options => @openstack_properties['connection_options'].merge(@extra_connection_options)
+      }
+
+      begin
+        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 => e
+        cloud_error("Unable to connect to the OpenStack Volume API: #{e.message}. Check task debug log for details.")
+      end
+
+      @volume
+    end
+
     ##
     # Generates an unique name
     #

data/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.3033.0'
+    VERSION = '1.3039.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3033.0
+  version: 1.3039.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-13 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.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH OpenStack CPI
-  2c1c13
+  e8cf4e
 email: support@cloudfoundry.com
 executables:
 - bosh_openstack_console