vagrant-xenserver 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1cc23a51d274952345b4ed8f1f3c9f8e9a2a58
-  data.tar.gz: c8120a254299c1ac2fe863f25b6a1fb0606efe13
+  metadata.gz: b160454892499671028a56bbb41030ad8f3c40f6
+  data.tar.gz: a7a6414c9765c0f2c075795553c3c66cb4d94f69
 SHA512:
-  metadata.gz: 9c37ac03de57c2361c481530cbc95e69d73918a498f513d872fd152a166fcdc8b45fa7d9c69f240f3b0e0992d7a4159260d7b51d95f27860f5595bb5ecac67e9
-  data.tar.gz: 04e395b2f77f141d45e083c0826f8ae690ca27db6fba83794568ba6d8790944c4e88e148f47c5dcc978715748c490c54445744fb3920fb2e83bf45e9423d6d1b
+  metadata.gz: 4945ebf31e0549ce5c76ccdfb46119a668f011ccb006eeace60369c0b45c81e1e15b2aa93480150ac706de1eb2dbdb5678b2a8e5543f348c4334876e608b68b3
+  data.tar.gz: 1cb9bae2dbc6e9a1aacc30d6718dc37be218f79dcff5d40aae16af23a52ad6dd6e895749ce67153855c31d13c5b284df6f2a0008430e46068aba511133466f71

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.2 (7 July 2014)
+
+* Support older versions of qemu-img that don't output
+  json
+
 # 0.0.1 (7 July 2014)
 
 * Use the md5 of the first meg of VHD to tag the base VDI

data/lib/vagrant-xenserver/action/upload_vhd.rb

@@ -38,9 +38,15 @@ module VagrantPlugins
           if not vdi_ref_rec
 
             # Find out virtual size of the VHD
-            disk_info=JSON.parse(IO.popen(["qemu-img", "info",box_vhd_file,"--output=json"]).read)
+            disk_info={}
+            begin
+              disk_info=JSON.parse(IO.popen(["qemu-img", "info",box_vhd_file]).read) 
+            rescue JSON::ParserError
+              size=`qemu-img info #{box_vhd_file} | grep "virtual size" | cut "-d(" -f2 | cut "-d " -f1`
+              disk_info['virtual-size']=size.strip
+            end
             virtual_size = disk_info['virtual-size']
-            
+            @logger.info("virtual_size=#{virtual_size}")
             pool=env[:xc].call("pool.get_all",env[:session])['Value'][0]
             default_sr=env[:xc].call("pool.get_default_SR",env[:session],pool)['Value']
           @logger.info("default_SR="+default_sr)

data/lib/vagrant-xenserver/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module XenServer
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xenserver
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jon Ludlam