vagrant-skytap 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc1bc4fb3154bdd71313b6757ed711402fd51ef
-  data.tar.gz: f6937b4bece80f2a364d73c5490c3824d89fadc4
+  metadata.gz: baf5d3c0b7fd0393c8740ccae53bb5f25265b057
+  data.tar.gz: fa4d72e87ee859399de360dabb0b81431c789005
 SHA512:
-  metadata.gz: 30c59354d60234aeb11b279feb5bd47d51b4f2c1930f41148bce0335ca2da8eda114d8853617af4eadad3012a086b4bb9366246af49c811434b340557468bbc2
-  data.tar.gz: ea5af2c5734a757f2be1061d806d58532b0595ad1ec11206e37473d539f3dace38489c488df2f93804816e26aa80da83968c1c3d05b9fd1a573f5d37e279d538
+  metadata.gz: 92bdf1421b8320b29235963ca160804ab6c0890f0965187c4e7a9cecd50e551d8d7257f754057195b9ee40f1daacd8c12991ee11216a4d2e1ddacf714584e5ab
+  data.tar.gz: 7f1d027f8a4909b5da9e3d705f222ec4a2c72f8909f41ae79a3475d74282f106af70a64a95d57b0b9f9f457e9081cf889f05c038451280bd2b3fd2f1e7bc022e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.5 (January 3, 2017)
+
+* Increase metadata service timeout, improve logging, handle still more errors (actually
+  rescue all system call errors)
+
 # 0.3.4 (April 27, 2016)
 
 * Add handling for additional network errors when fetching Skytap VM metadata.
@@ -22,7 +27,7 @@
 * New functionality to support running Vagrant from within a Skytap VM. The connection between host and
   guest will be made over a network tunnel between the two Skytap environments.
 * `vagrant ssh` now shows the expected error when the machine is not running.
-* Support unattended `vagrant up` by automatically choosing the only available connection option.  
+* Support unattended `vagrant up` by automatically choosing the only available connection option.
 
 # 0.2.10 (March 17, 2016)
 

data/lib/vagrant-skytap/cap/host_metadata.rb

@@ -29,8 +29,8 @@ module VagrantPlugins
     module Cap
       module HostMetadata
         METADATA_LINK_LOCAL_ADDRESS = '169.254.169.254'
-        OPEN_TIMEOUT = 2
-        READ_TIMEOUT = 5
+        OPEN_TIMEOUT = 5
+        READ_TIMEOUT = 15
 
         # If Vagrant is running in a Skytap VM, returns metadata from which an
         # [API::Vm] can be constructed. Otherwise returns nil.
@@ -40,10 +40,10 @@ module VagrantPlugins
         def self.host_metadata(machine)
           logger = Log4r::Logger.new("vagrant_skytap::cap::host_metadata")
 
-          # There are two addresses to try for the metadata service. If using
-          # the default DNS, 'gw' will resolve to the endpoint address. If
-          # using custom DNS, be prepared to fall back to the hard-coded IP
-          # address.
+          # A Skytap VM can request information about itself from the metadata
+          # service at http://gw/skytap. If the network is set to use custom
+          # DNS, 'gw' may resolve to something else, in which case we fall back
+          # to the service's link local address.
           ['gw', METADATA_LINK_LOCAL_ADDRESS].each do |host|
             begin
               http = Net::HTTP.new(host)
@@ -52,36 +52,36 @@ module VagrantPlugins
 
               # Test for a working web server before actually hitting the
               # metadata service. The response is expected to be 404.
+              logger.debug("Checking for HTTP service on host '#{host}' ...")
               http.request(Net::HTTP::Get.new("/"))
 
               begin
+                logger.debug("Fetching VM metadata from http://#{host}/skytap ...")
                 response = http.request(Net::HTTP::Get.new("/skytap"))
               rescue Timeout::Error => ex
+                logger.debug("The request timed out.")
                 raise Errors::MetadataServiceUnavailable
               end
 
-              if response.is_a?(Net::HTTPServerError)
-                raise Errors::MetadataServiceUnavailable
-              elsif response.is_a?(Net::HTTPOK)
-                attrs = JSON.parse(response.body)
-                return attrs if attrs.key?('configuration_url')
-                logger.debug("The JSON retrieved was not VM metadata! Ignoring.")
+              if response.is_a?(Net::HTTPOK)
+                if (attrs = JSON.parse(response.body)) && attrs.key?('configuration_url')
+                  logger.debug('Metadata retrieved successfully.')
+                  return attrs
+                end
+                logger.debug('The response did not contain VM metadata.')
+                logger.debug("Response body: #{response.body}")
+              else
+                logger.debug("The server responded with status #{response.code}.")
+                logger.debug("Response body: #{response.body}")
+                raise Errors::MetadataServiceUnavailable if response.is_a?(Net::HTTPServerError)
               end
-            rescue SocketError => ex
-              logger.debug("Could not resolve hostname '#{host}'.")
-            rescue Errno::ENETUNREACH => ex
-              logger.debug("No route exists for '#{host}'.")
-            rescue Errno::EHOSTDOWN => ex
-              logger.debug("The OS reported that '#{host}' is down.")
-            rescue Errno::ECONNREFUSED => ex
-              logger.debug("The connection was refused by '#{host}'.")
-            rescue Timeout::Error => ex
-              logger.debug("Response timed out for '#{host}'.")
-            rescue JSON::ParserError
-              logger.debug("Response from '#{host}' was garbled.")
+            rescue SystemCallError, SocketError, Timeout::Error, JSON::ParserError => ex
+              logger.debug(ex)
+              logger.debug("Response body: #{response.body}") if response.try(:body)
             end
           end
 
+          logger.debug("Could not obtain VM metadata. Host is not a Skytap VM.")
           nil
         end
       end

data/lib/vagrant-skytap/version.rb

@@ -22,6 +22,6 @@
 
 module VagrantPlugins
   module Skytap
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-skytap
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Eric True
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: vagrant-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.20'
 description: Enables Vagrant to manage Skytap machines.
@@ -117,13 +117,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- boxes/README.md
+- boxes/Vagrantfile
 - boxes/empty.box
 - boxes/metadata.json
-- boxes/README.md
 - boxes/ubuntu-1204-x64-us-west.box
-- boxes/Vagrantfile
-- CHANGELOG.md
-- Gemfile
+- lib/vagrant-skytap.rb
+- lib/vagrant-skytap/action.rb
 - lib/vagrant-skytap/action/action_helpers.rb
 - lib/vagrant-skytap/action/add_vm_to_environment.rb
 - lib/vagrant-skytap/action/check_created.rb
@@ -167,7 +173,6 @@ files:
 - lib/vagrant-skytap/action/timed_provision.rb
 - lib/vagrant-skytap/action/update_hardware.rb
 - lib/vagrant-skytap/action/wait_for_communicator.rb
-- lib/vagrant-skytap/action.rb
 - lib/vagrant-skytap/api/client.rb
 - lib/vagrant-skytap/api/connectable.rb
 - lib/vagrant-skytap/api/credentials.rb
@@ -193,11 +198,11 @@ files:
 - lib/vagrant-skytap/command/publish_url/show.rb
 - lib/vagrant-skytap/command/up.rb
 - lib/vagrant-skytap/config.rb
+- lib/vagrant-skytap/connection.rb
 - lib/vagrant-skytap/connection/public_ip_choice.rb
 - lib/vagrant-skytap/connection/published_service_choice.rb
 - lib/vagrant-skytap/connection/tunnel_choice.rb
 - lib/vagrant-skytap/connection/vpn_choice.rb
-- lib/vagrant-skytap/connection.rb
 - lib/vagrant-skytap/core_ext/object/blank.rb
 - lib/vagrant-skytap/core_ext/object/tap.rb
 - lib/vagrant-skytap/core_ext/try.rb
@@ -218,11 +223,7 @@ files:
 - lib/vagrant-skytap/util/timer.rb
 - lib/vagrant-skytap/version.rb
 - lib/vagrant-skytap/vm_properties.rb
-- lib/vagrant-skytap.rb
-- LICENSE
 - locales/en.yml
-- Rakefile
-- README.md
 - spec/acceptance/base.rb
 - spec/acceptance/shared/context_skytap.rb
 - spec/acceptance/skeletons/generic/Vagrantfile
@@ -273,7 +274,6 @@ files:
 - tasks/test.rake
 - vagrant-skytap.gemspec
 - vagrant-spec.config.rb
-- .gitignore
 homepage: http://www.skytap.com
 licenses:
 - MIT
@@ -284,17 +284,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: vagrant-skytap
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Vagrant provider plugin for Skytap.