bosh_openstack_cpi 2.0.0 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/cloud/openstack/cloud.rb +1 -1
- data/lib/cloud/openstack/helpers.rb +0 -8
- metadata +4 -18
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5afd1fc53c82628dd16ed49daf0c21a2f49adec0
|
|
4
|
+
data.tar.gz: 9cc83d556ea194f1447f2f3c896ca85e4c54c8ee
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 59c6e5fc8103606d286a3651b6d8a3827322a72b46e730a3d67b0b81e8d9d3545f0bbd8930e6adbbfcd8417e61de19f08b4fdfd2598db0eec949e595f1f9e633
|
|
7
|
+
data.tar.gz: 636b0ccdaca9d49bfb198acfd5e716411a30a88308cee08189651e9152b59802a8ea2af84b8538339db402528661510977b5cdad28a3fc66f8c668c757debaf4
|
|
@@ -935,7 +935,7 @@ module Bosh::OpenStackCloud
|
|
|
935
935
|
# @param [Fog::Compute::OpenStack::Flavor] OpenStack flavor
|
|
936
936
|
# @return [Boolean] true if flavor has ephemeral disk, false otherwise
|
|
937
937
|
def flavor_has_ephemeral_disk?(flavor)
|
|
938
|
-
flavor.ephemeral
|
|
938
|
+
flavor.ephemeral && flavor.ephemeral.to_i > 0
|
|
939
939
|
end
|
|
940
940
|
|
|
941
941
|
##
|
|
@@ -29,7 +29,6 @@ module Bosh::OpenStackCloud
|
|
|
29
29
|
# If we find a rate limit error, parse message, wait, and retry
|
|
30
30
|
overlimit = parse_openstack_response(e.response, "overLimit", "overLimitFault")
|
|
31
31
|
unless overlimit.nil? || retries >= MAX_RETRIES
|
|
32
|
-
task_checkpoint
|
|
33
32
|
wait_time = overlimit["retryAfter"] || e.response.headers["Retry-After"] || DEFAULT_RETRY_TIMEOUT
|
|
34
33
|
details = "#{overlimit["message"]} - #{overlimit["details"]}"
|
|
35
34
|
@logger.debug("OpenStack API Over Limit (#{details}), waiting #{wait_time} seconds before retrying") if @logger
|
|
@@ -98,8 +97,6 @@ module Bosh::OpenStackCloud
|
|
|
98
97
|
state_timeout = @state_timeout || DEFAULT_STATE_TIMEOUT
|
|
99
98
|
|
|
100
99
|
loop do
|
|
101
|
-
task_checkpoint
|
|
102
|
-
|
|
103
100
|
duration = Time.now - started_at
|
|
104
101
|
|
|
105
102
|
if duration > state_timeout
|
|
@@ -140,11 +137,6 @@ module Bosh::OpenStackCloud
|
|
|
140
137
|
@logger.info("#{desc} is now #{target_state.join(", ")}, took #{total}s")
|
|
141
138
|
end
|
|
142
139
|
end
|
|
143
|
-
|
|
144
|
-
def task_checkpoint
|
|
145
|
-
Bosh::Clouds::Config.task_checkpoint
|
|
146
|
-
end
|
|
147
|
-
|
|
148
140
|
end
|
|
149
141
|
|
|
150
142
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bosh_openstack_cpi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Piston Cloud Computing / VMware
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-10-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bosh_common
|
|
@@ -52,34 +52,20 @@ dependencies:
|
|
|
52
52
|
- - ">="
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
54
|
version: '0'
|
|
55
|
-
- !ruby/object:Gem::Dependency
|
|
56
|
-
name: fog-aws
|
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
|
58
|
-
requirements:
|
|
59
|
-
- - "<="
|
|
60
|
-
- !ruby/object:Gem::Version
|
|
61
|
-
version: 0.1.1
|
|
62
|
-
type: :runtime
|
|
63
|
-
prerelease: false
|
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
65
|
-
requirements:
|
|
66
|
-
- - "<="
|
|
67
|
-
- !ruby/object:Gem::Version
|
|
68
|
-
version: 0.1.1
|
|
69
55
|
- !ruby/object:Gem::Dependency
|
|
70
56
|
name: fog
|
|
71
57
|
requirement: !ruby/object:Gem::Requirement
|
|
72
58
|
requirements:
|
|
73
59
|
- - "~>"
|
|
74
60
|
- !ruby/object:Gem::Version
|
|
75
|
-
version: 1.
|
|
61
|
+
version: 1.34.0
|
|
76
62
|
type: :runtime
|
|
77
63
|
prerelease: false
|
|
78
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
65
|
requirements:
|
|
80
66
|
- - "~>"
|
|
81
67
|
- !ruby/object:Gem::Version
|
|
82
|
-
version: 1.
|
|
68
|
+
version: 1.34.0
|
|
83
69
|
- !ruby/object:Gem::Dependency
|
|
84
70
|
name: httpclient
|
|
85
71
|
requirement: !ruby/object:Gem::Requirement
|