vagrant-skytap 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad66d0732292fb4e3eade24cdcc614b00b18869
-  data.tar.gz: 193d5678f30a527277f1bd04816c41d6857a2e2f
+  metadata.gz: 23cca41d3984a6e739646a9986ce68b3a9655c0f
+  data.tar.gz: 830c1d85da9fd373e726f22226e3c1210c8f8c32
 SHA512:
-  metadata.gz: 27195d6fe141492a6979a4995ea2ba7aa20f0245a4e3409786f9bb65a58b3e1620cf9ef085221a2d00d13af7bf327d1f65bcdda13e831a15440adf45e07b39d2
-  data.tar.gz: d05d051aaf236112118c65d4ffeef8193ce29ec2fc2e2508622a0f8014ded4718d4be620abb5bf1224a01b2ae2f71641866bec76ecb72544b4c73a1aaa436b70
+  metadata.gz: a5b9d656915ae1fea5dea53592aaf47d558bc841bd5dbcb519e2a8d4390a6eae1e97ecd10c6d118fab1b385dafce3285b8dac63ba34157c1f6d499e37cc8ecc8
+  data.tar.gz: e275fb3e235b03714d3e2b7c1ce972799f96efade7c0adfe28b6337f20975b63e9887f8bc8d3ce17d287d1eeb1ccd5fe6842ea606935b066abe5a5ff8f2a8465

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.3 (April 25, 2016)
+
+* Improve error messaging for network tunnels.
+* Change default timeout value.
+* Update Vagrantfile for example box file.
+
 # 0.3.2 (April 19, 2016)
 
 * Retry all operations on 423 response (previously this was not happening when attaching to a VPN).

data/boxes/Vagrantfile

@@ -3,6 +3,7 @@
 
 Vagrant.configure(2) do |config|
   config.vm.provider :skytap do |skytap|
-    skytap.vm_url = "https://cloud.skytap.com/vms/3157858"
+    # Ubuntu 12.04 LTS Server (64-bit) in US-West region.
+    skytap.vm_url = "https://cloud.skytap.com/vms/8350530"
   end
 end

data/lib/vagrant-skytap/config.rb

@@ -109,8 +109,8 @@ module VagrantPlugins
         # VPN to use for connection to VM
         @vpn_url = nil if @vpn_url == UNSET_VALUE
 
-        # Set the default timeout for waiting for an instance to be ready
-        @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE
+        # Set the default timeout for runstate changes (e.g. running a VM)
+        @instance_ready_timeout = 300 if @instance_ready_timeout == UNSET_VALUE
 
         # Hardware settings default to nil (will be obtained
         # from the source VM)

data/lib/vagrant-skytap/connection/tunnel_choice.rb

@@ -51,19 +51,16 @@ module VagrantPlugins
         def valid?
           @validation_error_message = nil
 
-          unless host_network.tunnelable?
-            @validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.host_network_not_tunnelable")
-            return false
-          end
-
-          unless host_network.nat_enabled?
-            @validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.host_network_nat_disabled")
+          unless host_network.tunnelable? && host_network.nat_enabled?
+            @validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.host_network_not_connectable")
             return false
           end
 
           unless guest_network.nat_enabled?
             if guest_network.subnet.overlaps?(host_network.subnet)
-              @validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.guest_network_overlaps")
+              @validation_error_message = I18n.t("vagrant_skytap.connections.tunnel.errors.guest_network_overlaps",
+                                                 guest_subnet: guest_network.subnet, host_subnet: host_network.subnet,
+                                                 environment_url: iface.vm.environment.url)
               return false
             end
           end

data/lib/vagrant-skytap/version.rb

@@ -22,6 +22,6 @@
 
 module VagrantPlugins
   module Skytap
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/locales/en.yml

@@ -184,14 +184,20 @@ en:
         verb_create_and_use: |-
           Create and use tunnel to host network
         errors:
-          host_network_not_tunnelable: |-
-            The host's network must be tunnelable.
-          host_network_nat_disabled: |-
-            The host's network must have NAT enabled.
+          host_network_not_connectable: |-
+            To connect to the guest machine using a network tunnel, the host
+            VM must be connected to a network which is visible to other
+            networks and has a NAT subnet. Please go to the network settings
+            page for this VM and make these changes, then run `vagrant up` to
+            try again. (Note: it may be necessary to power off this VM before
+            making these changes.)
           guest_network_overlaps: |-
-            The guest's network subnet overlaps with the host's network.
-            (This can be resolved by changing network subnets, or by
-            enabling NAT on the guest network.)
+            The host and guest networks could not be connected via a network
+            tunnel because the guest VM's network subnet (%{guest_subnet})
+            overlaps with the host network subnet (%{host_subnet}). Please
+            change the guest network's subnet, or enable NAT on the guest
+            network's subnet, then run `vagrant up` to try again.
+            The guest VM's environment URL is: %{environment_url}
 
     commands:
       publish_urls:

data/vagrant-spec.config.rb

@@ -4,6 +4,8 @@ Vagrant::Spec::Acceptance.configure do |c|
   c.component_paths << File.expand_path("../spec/acceptance", __FILE__)
   c.skeleton_paths << File.expand_path("../spec/acceptance/skeletons", __FILE__)
 
+  c.assert_retries = 10
+
   c.provider "skytap",
     box: File.expand_path("../skytap-test.box", __FILE__),
     contexts: ["provider-context/skytap"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Eric True
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -120,6 +120,7 @@ files:
 - boxes/empty.box
 - boxes/metadata.json
 - boxes/README.md
+- boxes/ubuntu-1204-x64-us-west.box
 - boxes/Vagrantfile
 - CHANGELOG.md
 - Gemfile