bosh_openstack_cpi 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2fafbcdbbdb824f3fa02727c39ed29533dcd68e
-  data.tar.gz: 0d8c635b2691972a7036331a0a103fd7b0ab68c3
+  metadata.gz: 5afd1fc53c82628dd16ed49daf0c21a2f49adec0
+  data.tar.gz: 9cc83d556ea194f1447f2f3c896ca85e4c54c8ee
 SHA512:
-  metadata.gz: 8a6d377b2e41e96e9cfa2062a9ce36f7d03b28e83920b9c39c2cf76dbd8027012907008099991d01f601159a7a2f10da2482eb2cbf309556504a3e63334275c8
-  data.tar.gz: 04f4e14f7448aa454a334e0f9d1a29f86d9a7812d72d8f56dcf264b6522ba06ad7c2d6278d4759e91aa968b6b4a52a987195687b1c660cea662baf425dedf24b
+  metadata.gz: 59c6e5fc8103606d286a3651b6d8a3827322a72b46e730a3d67b0b81e8d9d3545f0bbd8930e6adbbfcd8417e61de19f08b4fdfd2598db0eec949e595f1f9e633
+  data.tar.gz: 636b0ccdaca9d49bfb198acfd5e716411a30a88308cee08189651e9152b59802a8ea2af84b8538339db402528661510977b5cdad28a3fc66f8c668c757debaf4

data/lib/cloud/openstack/cloud.rb

@@ -935,7 +935,7 @@ module Bosh::OpenStackCloud
     # @param [Fog::Compute::OpenStack::Flavor] OpenStack flavor
     # @return [Boolean] true if flavor has ephemeral disk, false otherwise
     def flavor_has_ephemeral_disk?(flavor)
-      flavor.ephemeral.nil? || flavor.ephemeral.to_i <= 0 ? false : true
+      flavor.ephemeral && flavor.ephemeral.to_i > 0
     end
 
     ##

data/lib/cloud/openstack/helpers.rb

@@ -29,7 +29,6 @@ module Bosh::OpenStackCloud
         # If we find a rate limit error, parse message, wait, and retry
         overlimit = parse_openstack_response(e.response, "overLimit", "overLimitFault")
         unless overlimit.nil? || retries >= MAX_RETRIES
-          task_checkpoint
           wait_time = overlimit["retryAfter"] || e.response.headers["Retry-After"] || DEFAULT_RETRY_TIMEOUT
           details = "#{overlimit["message"]} - #{overlimit["details"]}"
           @logger.debug("OpenStack API Over Limit (#{details}), waiting #{wait_time} seconds before retrying") if @logger
@@ -98,8 +97,6 @@ module Bosh::OpenStackCloud
       state_timeout = @state_timeout || DEFAULT_STATE_TIMEOUT
 
       loop do
-        task_checkpoint
-
         duration = Time.now - started_at
 
         if duration > state_timeout
@@ -140,11 +137,6 @@ module Bosh::OpenStackCloud
         @logger.info("#{desc} is now #{target_state.join(", ")}, took #{total}s")
       end
     end
-
-    def task_checkpoint
-      Bosh::Clouds::Config.task_checkpoint
-    end
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Piston Cloud Computing / VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -52,34 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog-aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.34.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement