bosh_openstack_cpi 1.2986.0 → 1.2989.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cloud/openstack/cloud.rb +22 -13
- data/lib/cloud/openstack/version.rb +1 -1
- metadata +9 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 71490bb6f127ca6287a94d5a82c63f287d7c29cf
|
4
|
+
data.tar.gz: c48086b21d58ade0eeaac458f0edc7898136fad4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b61589c309a1454f62a01c73a73de23340a9bd0098270430dd5ecd3708553ca0d453b50833288a8f0812d6691ad07335036dfa54eb5ba20b851477a3285fbbfc
|
7
|
+
data.tar.gz: 52addea7ffa4d413ba146120d6e2c8e69ccc0e7fe9afcdef3e680a92952141275156dbc22e0f18c749fe5505219f58ef870480d98a86a183136e730a5163c421
|
@@ -302,22 +302,20 @@ module Bosh::OpenStackCloud
|
|
302
302
|
network_configurator.configure(@openstack, server)
|
303
303
|
rescue Bosh::Clouds::CloudError => e
|
304
304
|
@logger.warn("Failed to create server: #{e.message}")
|
305
|
-
|
306
|
-
with_openstack { server.destroy }
|
307
|
-
|
308
|
-
begin
|
309
|
-
wait_resource(server, [:terminated, :deleted], :state, true)
|
310
|
-
rescue Bosh::Clouds::CloudError => delete_server_error
|
311
|
-
@logger.warn("Failed to destroy server: #{delete_server_error.inspect}\n#{delete_server_error.backtrace.join('\n')}")
|
312
|
-
end
|
313
|
-
|
305
|
+
destroy_server(server)
|
314
306
|
raise Bosh::Clouds::VMCreationFailed.new(true), e.message
|
315
307
|
end
|
316
308
|
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
309
|
+
begin
|
310
|
+
@logger.info("Updating settings for server `#{server.id}'...")
|
311
|
+
settings = initial_agent_settings(server_name, agent_id, network_spec, environment,
|
312
|
+
flavor_has_ephemeral_disk?(flavor))
|
313
|
+
@registry.update_settings(server.name, settings)
|
314
|
+
rescue Bosh::Clouds::CloudError => e
|
315
|
+
@logger.warn("Failed to register server: #{e.message}")
|
316
|
+
destroy_server(server)
|
317
|
+
raise Bosh::Clouds::VMCreationFailed.new(false), e.message
|
318
|
+
end
|
321
319
|
|
322
320
|
server.id.to_s
|
323
321
|
end
|
@@ -980,5 +978,16 @@ module Bosh::OpenStackCloud
|
|
980
978
|
end
|
981
979
|
options
|
982
980
|
end
|
981
|
+
|
982
|
+
# Destroy server and wait until the server is really terminated/deleted
|
983
|
+
def destroy_server(server)
|
984
|
+
with_openstack { server.destroy }
|
985
|
+
|
986
|
+
begin
|
987
|
+
wait_resource(server, [:terminated, :deleted], :state, true)
|
988
|
+
rescue Bosh::Clouds::CloudError => delete_server_error
|
989
|
+
@logger.warn("Failed to destroy server: #{delete_server_error.inspect}\n#{delete_server_error.backtrace.join('\n')}")
|
990
|
+
end
|
991
|
+
end
|
983
992
|
end
|
984
993
|
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: 1.
|
4
|
+
version: 1.2989.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-06-
|
11
|
+
date: 2015-06-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fog-aws
|
@@ -44,42 +44,42 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
47
|
+
version: 1.2989.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
54
|
+
version: 1.2989.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: bosh_cpi
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: 1.
|
61
|
+
version: 1.2989.0
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: 1.
|
68
|
+
version: 1.2989.0
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: bosh-registry
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: 1.
|
75
|
+
version: 1.2989.0
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: 1.
|
82
|
+
version: 1.2989.0
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: httpclient
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -180,7 +180,7 @@ dependencies:
|
|
180
180
|
version: '0'
|
181
181
|
description: |-
|
182
182
|
BOSH OpenStack CPI
|
183
|
-
|
183
|
+
0c4ecd
|
184
184
|
email: support@cloudfoundry.com
|
185
185
|
executables:
|
186
186
|
- bosh_openstack_console
|