vagrant-xenserver 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863a12a0d4f0def43d9e81dc02d35aa71d2c2992
-  data.tar.gz: 72bb9e377c24be9a249c3d23cbe827d9be1c47a4
+  metadata.gz: 9ccddd2df09b0bf274e51c62dc9acaa73e8b1388
+  data.tar.gz: 97e32f1c89949c5f34221da90720265bfec38d7b
 SHA512:
-  metadata.gz: 24a88789435fd29b0f6a9c43bc31275bb4a260a444ccc1c9fd4e6f54c8d4f60d7ef99864aab262feebd229ca77dbf1b631875354c34cd7977869b74ebfe8eaf1
-  data.tar.gz: aa8d34e7b64708274df83a175c396fc49f44ac2e3e57daabb59e5b839225284362454e62b96074577bc4c92fc48d0408a6f218bbcb6cbde85209a14bc681919c
+  metadata.gz: 0f183b2649147ae4f29a34d2da8452338f4f40b27626bd4ead0f4be2305b2448a8c67b0bdf3089e494ca2e240e76f1d04789c05cc32a08531dbd4ff14aa1d174
+  data.tar.gz: c79c60e7e0c2d375209b3e5a11d32366386f30d277ab97ce571141a751140453f6101b73bb3d2fa720e55e569efb3ae89247a2f7b732fe1b0a3807e770390305

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.14 (27 July 2017)
+* Fix use of snapshots
+* Better error when when the host doesn't have the required PIF
+* No longer require netcat on the target host
+
 # 0.0.8 (8 September 2014)
 
 * Correct typos

data/README.md

@@ -141,15 +141,8 @@ plugin supports using the 'host internal management network' (HIMN),
 which is an internal-only network on which a DHCP server runs. Use of
 this requires additional setup of dom0:
 
-N.B. Currently this will only work on XenServer 6.5 and later:
-```shell
-# Install netcat (XenServer 7.0 onwards)
-yum install --enablerepo=base,extras -y nc
-# Install netcat (XenServer 6.5)
-yum install --enablerepo=base,extras --disablerepo=citrix -y nc
-```
-
-You will also need to copy your ssh key to the Xenserver host:
+N.B. Currently this will only work on XenServer 6.5 and later.
+You will need to copy your ssh key to the Xenserver host:
 
     ssh-copy-id root@xenserver
 

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

@@ -61,6 +61,10 @@ module VagrantPlugins
 
               netrefrec = networks.find { |ref,net| net['bridge']==bridge }
               (net_ref,net_rec) = netrefrec
+              if net_ref.nil? then
+                  @logger.error("Error finding bridge #{bridge} on host")
+                  raise Errors::NoHostsAvailable
+              end
 
               vif_res = create_vif(env, vm_ref, net_ref, mac)
 

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

@@ -30,7 +30,7 @@ module VagrantPlugins
           template = nil
 
           Action.getlock.synchronize do
-            templates = env[:xc].VM.get_all_records_where("field \"is_a_template\"=\"true\"")
+            templates = env[:xc].VM.get_all_records_where("field \"is_a_template\"=\"true\" and field \"is_a_snapshot\"=\"false\"")
             template = templates.detect { |vm,vmr|
               vmr["other_config"]["box_name"] == box_name &&
                 vmr["other_config"]["box_version"] == box_version

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

@@ -50,7 +50,7 @@ module VagrantPlugins
             :forward_x11   => machine.config.ssh.forward_x11,
           }
 
-          ssh_info[:proxy_command] = "ssh '#{machine.provider_config.xs_host}' -l '#{machine.provider_config.xs_username}' nc %h %p"
+          ssh_info[:proxy_command] = "ssh '#{machine.provider_config.xs_host}' -l '#{machine.provider_config.xs_username}' -W %h:%p"
 
           if not ssh_info[:username]
             ssh_info[:username] = machine.config.ssh.default.username

data/lib/vagrant-xenserver/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module XenServer
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xenserver
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Jon Ludlam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake