vagrant-xenserver 0.0.10 → 0.0.11
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5eaf14c14f04943700ffc16f39647823e4175daa
|
4
|
+
data.tar.gz: 86c9c38a1350cd2b26fb186b2fc2acfc15bed137
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f8085d05f42304cabccfa37f54c1f33d0d3a130edd30aadbc1c4953ac8bc7269dfc5ad441fa23813dc8d4209542edbbc57b7d63cca2786c594d204e969278c8f
|
7
|
+
data.tar.gz: 06cacc5f7ac068995cc760f42a63913477074a37d3db2568dd345e7492f8ced2a1703a399ed0e212fffbe966e1dfd417126cf354bc7fbfec8bbf94c82717af1e
|
@@ -8,6 +8,9 @@ module VagrantPlugins
|
|
8
8
|
module XenServer
|
9
9
|
module Action
|
10
10
|
class UploadVHD
|
11
|
+
|
12
|
+
@@lock = Mutex.new
|
13
|
+
|
11
14
|
def initialize(app, env)
|
12
15
|
@app = app
|
13
16
|
@logger = Log4r::Logger.new("vagrant::xenserver::actions::upload_vhd")
|
@@ -36,7 +39,7 @@ module VagrantPlugins
|
|
36
39
|
}
|
37
40
|
|
38
41
|
if not vdi_ref_rec
|
39
|
-
|
42
|
+
@@lock.synchronize do
|
40
43
|
# Find out virtual size of the VHD
|
41
44
|
disk_info={}
|
42
45
|
begin
|
@@ -49,7 +52,7 @@ module VagrantPlugins
|
|
49
52
|
@logger.info("virtual_size=#{virtual_size}")
|
50
53
|
pool=env[:xc].call("pool.get_all",env[:session])['Value'][0]
|
51
54
|
default_sr=env[:xc].call("pool.get_default_SR",env[:session],pool)['Value']
|
52
|
-
|
55
|
+
@logger.info("default_SR="+default_sr)
|
53
56
|
vdi_record = {
|
54
57
|
'name_label' => 'Vagrant disk',
|
55
58
|
'name_description' => 'Base disk uploaded for the vagrant box '+env[:machine].box.name.to_s+' v'+env[:machine].box.version.to_s,
|
@@ -111,10 +114,10 @@ module VagrantPlugins
|
|
111
114
|
raise Errors::APIError
|
112
115
|
end
|
113
116
|
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
117
|
+
task_result_result = env[:xc].call("task.get_result",env[:session],task)
|
118
|
+
if task_result_result["Status"] != "Success"
|
119
|
+
raise Errors::APIError
|
120
|
+
end
|
118
121
|
|
119
122
|
task_result = task_result_result["Value"]
|
120
123
|
|
@@ -130,6 +133,7 @@ module VagrantPlugins
|
|
130
133
|
@logger.info("task_result=" + tag_result.to_s)
|
131
134
|
|
132
135
|
env[:box_vdi] = vdi_result
|
136
|
+
end
|
133
137
|
else
|
134
138
|
(reference,record) = vdi_ref_rec
|
135
139
|
env[:box_vdi] = reference
|