bosh_vcloud_cpi 0.5.3 → 0.5.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/cloud/vcloud/steps/recompose.rb +8 -3
- data/lib/cloud/vcloud/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0c75f38d47794901287ec60ea31c0930390b3619
|
4
|
+
data.tar.gz: 82f2ef9fbf7ac32f5a5b63d6f953fb11b2f74f05
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f63d6d3f03c6777c2c1a6f38c773a5720b369ce7dfd9a9e0aca4961a1eb1180b470c5cb8bd36d5d5211224ce21e41174b7e99a302e2b7049925ca72f96eec1c8
|
7
|
+
data.tar.gz: 2c1b57504536b4785e5a639c6cd69a8f9bf0851c2fb14d5895ec1f56a2961a91f4e2bc43806aaec0b3fd3311d3bd176c1da8e3d52d7d9821cdf09d2f377fcee1
|
@@ -12,6 +12,7 @@ module VCloudCloud
|
|
12
12
|
|
13
13
|
# HACK: Workaround. recomposeLink is not available when vapp is running (so force construct the link)
|
14
14
|
recompose_vapp_link = container_vapp.recompose_vapp_link true
|
15
|
+
state[:recompose_vapp_name] = name
|
15
16
|
client.invoke_and_wait :post, recompose_vapp_link, :payload => params
|
16
17
|
end
|
17
18
|
|
@@ -19,12 +20,15 @@ module VCloudCloud
|
|
19
20
|
# The recompose method is only used in create_vm step.
|
20
21
|
# The rollback logic here is to delete the new-created VM.
|
21
22
|
vm = state[:vm]
|
22
|
-
|
23
|
+
vapp_name = state[:recompose_vapp_name]
|
24
|
+
if !vm.nil? && !vapp_name.nil?
|
23
25
|
@logger.debug "Requesting VM: #{vm.name}"
|
24
26
|
|
25
27
|
begin
|
26
|
-
|
27
|
-
|
28
|
+
client.flush_cache
|
29
|
+
vapp = client.vapp_by_name vapp_name
|
30
|
+
target_vm = vapp.vms.find { |v| v.name == vm.name }
|
31
|
+
link = target_vm.remove_link true
|
28
32
|
client.invoke_and_wait :delete, link if link
|
29
33
|
rescue => ex
|
30
34
|
@logger.debug(ex) if @logger
|
@@ -32,6 +36,7 @@ module VCloudCloud
|
|
32
36
|
|
33
37
|
# remove the item from state
|
34
38
|
state.delete :vm
|
39
|
+
state.delete :recompose_vapp_name
|
35
40
|
end
|
36
41
|
end
|
37
42
|
end
|
data/lib/cloud/vcloud/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bosh_vcloud_cpi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- VMware
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-04-
|
11
|
+
date: 2014-04-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bosh_common
|
@@ -110,7 +110,7 @@ dependencies:
|
|
110
110
|
version: 1.5.6
|
111
111
|
description: |-
|
112
112
|
BOSH vCloud CPI
|
113
|
-
|
113
|
+
645f27
|
114
114
|
email: support@cloudfoundry.com
|
115
115
|
executables: []
|
116
116
|
extensions: []
|