vagrant-google 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56c269053218677aef26b41cdf092fe60b890fc8
-  data.tar.gz: bd41eebae2f6bd365cae32764d04b2999a9f6dad
+  metadata.gz: cc34cd087ca2be06cd2f4c4ebf0299397e2ead9b
+  data.tar.gz: 80878f7ea508eeeadbc61b122ca2e68f86729dcd
 SHA512:
-  metadata.gz: 1a8bbc4a2194f92ccdf15bb7962f87a1d41af8ed94f6bd676b9fe63450ec8845edcc701893732d283df9f5b7f699542a67c7a184395fb77cd043153939c4fa3a
-  data.tar.gz: 6b4c64c595b3789d1f5d4b50c86289d0a18618d02b567d151a90ff230a05577eeeef6d0aa82751ac75dc4118c74c2483e4175f5ff1a0eb69d861fe23532be85e
+  metadata.gz: 9c5bfaab84c111b6619d163d566b329786520d4e7010444e75c6455e69a9256c3fc8abb7f150853df2d2eb88a853e2937d318aa4982bbd4a254d1a5002028b32
+  data.tar.gz: fd31180ce6ce43321b4005406d6ea34d967dcfad11cbea9db1c8406b889e8b2bb86d22793d36bfc1c7683b5323165e27606632ce19df64843f2e64a3a8ac3c6d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.2 (October 2015)
+
+* Cleanup instance and disks on backend failures [p0deje]
+* Refactoring ssh warnings into separate action [temikus]
+* Refactoring disk type detection logic [temikus]
+* Miscellaneous doc updates and minor fixes [mbrukman, temikus]
+
 # 0.2.1 (July 2015)
 
 * Temporarily reverted the old SyncedFolders behaviour. (See #94)

data/README.md

@@ -172,7 +172,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `disk_size` - The disk size in GB.  The default is 10.
 * `disk_name` - The disk name to use.  If the disk exists, it will be reused, otherwise created.
 * `metadata` - Custom key/value pairs of metadata to add to the instance.
-* `name` - The name of your instance.  The default is "i-yyyyMMddHH". Example 2014/10/01 10:00:00 is "i-2014100101".
+* `name` - The name of your instance.  The default is "i-yyyymmddhh-randomsd",
+  e.g. 10/08/2015 13:15:15 is "i-2015081013-15637fda".
 * `network` - The name of the network to use for the instance.  Default is
  "default".
 * `tags` - An array of tags to apply to this instance.
@@ -180,8 +181,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `can_ip_forward` - Boolean whether to enable IP Forwarding.
 * `external_ip` - The external IP address to use (supports names).
 * `preemptible` - Boolean whether to enable preemptibility. Default is false.
-* `auto_restart` - Boolean whether to enable auto_restart. Default is true.  
-* `on_host_maintenance` - What to do on host maintenance. Default is "MIGRATE".  
+* `auto_restart` - Boolean whether to enable auto_restart. Default is true.
+* `on_host_maintenance` - What to do on host maintenance. Default is "MIGRATE".
 * `service_accounts` or `scopes` - An array of OAuth2 account scopes for
   services that the instance will have access to. Those can be both full API
   scopes, just endpoint aliases (the part after `...auth/`), and `gcloud`
@@ -297,10 +298,10 @@ export GOOGLE_SSH_USER="testuser"
 export GOOGLE_SSH_KEY_LOCATION="/home/testuser/.ssh/id_rsa"
 ```
 
-After, you can run acceptance tests by running the `run` task in `acceptance`
+After, you can run acceptance tests by running the `full` task in `acceptance`
 namespace:
 ```sh
-$ bundle exec rake acceptance:run
+$ bundle exec rake acceptance:full
 ```
 
 **IMPORTANT NOTES**:

data/lib/vagrant-google/action.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -41,7 +41,7 @@ module VagrantPlugins
             if env[:result]
               b2.use ConfigValidate
               b2.use Call, IsCreated do |env2, b3|
-                if !env2[:result]
+                unless env2[:result]
                   b3.use MessageNotCreated
                   next
                 end
@@ -60,7 +60,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -98,7 +98,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -112,7 +112,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
-            if !env[:result]
+            unless env[:result]
               b2.use MessageNotCreated
               next
             end
@@ -136,6 +136,7 @@ module VagrantPlugins
                   b2.use Provision
                   b2.use SyncFolders
                   b2.use WarnNetworks
+                  b2.use WarnSshKeys
                   b2.use StartInstance
                 else
                   # TODO: Impement better messages for different states
@@ -146,6 +147,7 @@ module VagrantPlugins
               b1.use Provision
               b1.use SyncFolders
               b1.use WarnNetworks
+              b1.use WarnSshKeys
               b1.use RunInstance
             end
           end
@@ -157,7 +159,7 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use ConnectGoogle
           b.use Call, IsCreated do |env1, b1|
-            if !env1[:result]
+            unless env1[:result]
               b1.use MessageNotCreated
               next
             end
@@ -186,6 +188,7 @@ module VagrantPlugins
       autoload :TerminateInstance, action_root.join("terminate_instance")
       autoload :TimedProvision, action_root.join("timed_provision")
       autoload :WarnNetworks, action_root.join("warn_networks")
+      autoload :WarnSshKeys, action_root.join("warn_ssh_keys")
     end
   end
 end

data/lib/vagrant-google/action/run_instance.rb

@@ -22,6 +22,12 @@ module VagrantPlugins
       class RunInstance
         include Vagrant::Util::Retryable
 
+        FOG_ERRORS = [
+          Fog::Compute::Google::NotFound,
+          Fog::Compute::Google::Error,
+          Fog::Errors::Error
+        ]
+
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new("vagrant_google::action::run_instance")
@@ -73,24 +79,14 @@ module VagrantPlugins
           env[:ui].info(" -- Autodelete Disk: #{autodelete_disk}")
           env[:ui].info(" -- Scopes:          #{service_accounts}")
           begin
-            request_start_time = Time.now().to_i
-            # Warn on ssh-key overrides
-            if env[:machine].config.ssh.username.nil?
-              env[:ui].warn(I18n.t("vagrant_google.warn_ssh_vagrant_user"))
-            end
+            request_start_time = Time.now.to_i
+
             # Check if specified external ip is available
             external_ip = get_external_ip(env, external_ip) if external_ip
-            # Check if disk type is available in the zone
-            if !disk_type.nil?
-              disk_type_obj = env[:google_compute].list_disk_types(zone).body['items'].select { |dt| dt['name'] == disk_type } || []
-              if !disk_type_obj.empty?
-                disk_type = disk_type_obj[0]["selfLink"]
-              else
-                raise Errors::DiskTypeError,
-                      :disktype => disk_type
-              end
-            end
+            # Check if disk type is available in the zone and set the proper resource link
+            disk_type = get_disk_type(env, disk_type, zone)
 
+            disk_created_by_vagrant = false
             if disk_name.nil?
               # no disk_name... disk_name defaults to instance name
               disk = env[:google_compute].disks.create(
@@ -100,6 +96,7 @@ module VagrantPlugins
                   zone_name: zone,
                   source_image: image
               )
+              disk_created_by_vagrant = true
               disk.wait_for { disk.ready? }
             else
               disk = env[:google_compute].disks.get(disk_name, zone)
@@ -112,6 +109,7 @@ module VagrantPlugins
                     zone_name: zone,
                     source_image: image
                 )
+                disk_created_by_vagrant = true
                 disk.wait_for { disk.ready? }
               end
             end
@@ -136,9 +134,13 @@ module VagrantPlugins
             }
             server = env[:google_compute].servers.create(defaults)
             @logger.info("Machine '#{zone}:#{name}' created.")
-          rescue Fog::Compute::Google::NotFound => e
-            raise
-          rescue Fog::Compute::Google::Error => e
+          rescue *FOG_ERRORS => e
+            # there is a chance Google responded with error but actually created
+            # instance, so we need to remove it
+            cleanup_instance(env)
+            # there is a chance Google has failed to create instance, so we need
+            # to remove created disk
+            cleanup_disk(disk.name, env) if disk && disk_created_by_vagrant
             raise Errors::FogError, :message => e.message
           end
 
@@ -149,14 +151,14 @@ module VagrantPlugins
           env[:ui].info(I18n.t("vagrant_google.waiting_for_ready"))
           begin
             server.wait_for { ready? }
-            env[:metrics]["instance_ready_time"] = Time.now().to_i - request_start_time
+            env[:metrics]["instance_ready_time"] = Time.now.to_i - request_start_time
             @logger.info("Time for instance ready: #{env[:metrics]["instance_ready_time"]}")
             env[:ui].info(I18n.t("vagrant_google.ready"))
           rescue
             env[:interrupted] = true
           end
 
-          if !env[:terminated]
+          unless env[:terminated]
             env[:metrics]["instance_ssh_time"] = Util::Timer.time do
               # Wait for SSH to be ready.
               env[:ui].info(I18n.t("vagrant_google.waiting_for_ssh"))
@@ -194,6 +196,17 @@ module VagrantPlugins
           env[:action_runner].run(Action.action_destroy, destroy_env)
         end
 
+        def get_disk_type(env, disk_type, zone)
+          begin
+            # TODO(temikus): Outsource parsing logic to fog-google
+            disk_type=env[:google_compute].get_disk_type(disk_type, zone).body["selfLink"]
+          rescue Fog::Errors::NotFound
+            raise Errors::DiskTypeError,
+                  :disktype => disk_type
+          end
+          disk_type
+        end
+
         def get_external_ip(env, external_ip)
           address = env[:google_compute].addresses.get_by_ip_address_or_name(external_ip)
           if address.nil?
@@ -207,6 +220,22 @@ module VagrantPlugins
           # Resolve the name to IP address
           address.address
         end
+
+        def cleanup_instance(env)
+          zone = env[:machine].provider_config.zone
+          zone_config = env[:machine].provider_config.get_zone_config(zone)
+          server = env[:google_compute].servers.get(zone_config.name, zone)
+          server.destroy(false) if server
+        end
+
+        def cleanup_disk(disk_name, env)
+          zone = env[:machine].provider_config.zone
+          autodelete_disk = env[:machine].provider_config.get_zone_config(zone).autodelete_disk
+          if autodelete_disk
+            disk = env[:google_compute].disks.get(disk_name, zone)
+            disk.destroy(false) if disk
+          end
+        end
       end
     end
   end

data/lib/vagrant-google/action/start_instance.rb

@@ -64,7 +64,7 @@ module VagrantPlugins
 
           @logger.info("Time to instance ready: #{env[:metrics]["instance_ready_time"]}")
 
-          if !env[:interrupted]
+          unless env[:interrupted]
             env[:metrics]["instance_ssh_time"] = Util::Timer.time do
               # Wait for SSH to be ready.
               env[:ui].info(I18n.t("vagrant_google.waiting_for_ssh"))

data/lib/vagrant-google/action/stop_instance.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
           else
             env[:ui].info(I18n.t("vagrant_google.stopping"))
             operation = server.stop
-            operation.wait_for() { ready? }
+            operation.wait_for { ready? }
           end
 
           @app.call(env)

data/lib/vagrant-google/action/sync_folders.rb

@@ -41,7 +41,7 @@ module VagrantPlugins
             next if data[:disabled]
 
             unless Vagrant::Util::Which.which('rsync')
-              env[:ui].warn(I18n.t('vagrant_aws.rsync_not_found_warning'))
+              env[:ui].warn(I18n.t('vagrant_google.rsync_not_found_warning'))
               break
             end
 

data/lib/vagrant-google/action/terminate_instance.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
           # Destroy the server and remove the tracking ID
           # destroy() is called with 'false' to disable asynchronous execution.
           env[:ui].info(I18n.t("vagrant_google.terminating"))
-          server.destroy(false) if not server.nil?
+          server.destroy(false) unless server.nil?
           env[:machine].id = nil
 
           @app.call(env)

data/lib/vagrant-google/action/warn_ssh_keys.rb

@@ -0,0 +1,33 @@
+# Copyright 2015 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+module VagrantPlugins
+  module Google
+    module Action
+      class WarnSshKeys
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # Warn on ssh-key overrides
+          if env[:machine].config.ssh.username.nil?
+            env[:ui].warn(I18n.t("vagrant_google.warn_ssh_vagrant_user"))
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-google/config.rb

@@ -250,7 +250,8 @@ module VagrantPlugins
         # Default disk type is pd-standard
         @disk_type = "pd-standard" if @disk_type == UNSET_VALUE
 
-        # Instance name defaults to a new datetime value (hour granularity)
+        # Instance name defaults to a new datetime value + random seed
+        # e.g. i-2015081013-15637fdb
         if @name == UNSET_VALUE
           t = Time.now
           @name = "i-#{t.strftime("%Y%m%d%H")}-" + SecureRandom.hex(4)
@@ -287,7 +288,7 @@ module VagrantPlugins
 
         # Compile our zone specific configurations only within
         # NON-zone-SPECIFIC configurations.
-        if !@__zone_specific
+        unless @__zone_specific
           @__zone_config.each do |zone, blocks|
             config = self.class.new(true).merge(self)
 
@@ -326,6 +327,9 @@ module VagrantPlugins
             !config.google_key_location.nil? and !config.google_json_key_location.nil?
           errors << I18n.t("vagrant_google.config.google_key_location_required") if \
             config.google_key_location.nil? and config.google_json_key_location.nil?
+          errors << I18n.t("vagrant_google.config.private_key_missing") unless \
+            File.exist?(config.google_key_location.to_s) or \
+            File.exist?(config.google_json_key_location.to_s)
 
           if config.preemptible
             errors << I18n.t("vagrant_google.config.auto_restart_invalid_on_preemptible") if \
@@ -344,7 +348,7 @@ module VagrantPlugins
       # This gets the configuration for a specific zone. It shouldn't
       # be called by the general public and is only used internally.
       def get_zone_config(name)
-        if !@__finalized
+        unless @__finalized
           raise "Configuration must be finalized before calling this method."
         end
 

data/lib/vagrant-google/plugin.rb

@@ -70,7 +70,7 @@ module VagrantPlugins
         # Some constants, such as "true" resolve to booleans, so the
         # above error checking doesn't catch it. This will check to make
         # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
+        level = nil unless level.is_a?(Integer)
 
         # Set the logging level on all "vagrant" namespaced
         # logs as long as we have a valid level.

data/lib/vagrant-google/version.rb

@@ -13,6 +13,6 @@
 # limitations under the License.
 module VagrantPlugins
   module Google
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/locales/en.yml

@@ -25,8 +25,6 @@ en:
       Terminating the instance...
     waiting_for_ready: |-
       Waiting for instance to become "ready"...
-    waiting_for_stop: |-
-      Waiting for instance to become terminated...
     waiting_for_ssh: |-
       Waiting for SSH to become available...
     warn_networks: |-
@@ -49,13 +47,16 @@ en:
 #-------------------------------------------------------------------------------
     config:
       google_client_email_required: |-
-        A Google Service Account client email is required via "google_client_email"
+        A Google Service Account client email is required via
+        "google_client_email".
       private_key_missing: |-
-        The specified private key for Google could not be found
+        Private key for Google could not be found in the specified location.
       zone_required: |-
-        A zone must be specified via "zone"
+        A zone must be specified via "zone" option.
       name_required: |-
-        An instance name must be specified via "name"
+        An instance name must be specified via "name" option.
+      image_required: |-
+        An image must be specified via "image" option.
       google_key_location_required: |-
         A private key pathname is required via:
          "google_json_key_location" (for JSON keys)
@@ -65,7 +66,7 @@ en:
         Both "google_json_key_location" and "google_key_location" are specified.
         Config must specify only one key location.
       google_project_id_required: |-
-        A Google Cloud Project ID is required via "google_project_id"
+        A Google Cloud Project ID is required via "google_project_id".
       auto_restart_invalid_on_preemptible: |-
         "auto_restart" option must be set to "false" for preemptible instances.
       on_host_maintenance_invalid_on_preemptible: |-

data/tasks/acceptance.rake

@@ -14,35 +14,44 @@ end
 
 namespace :acceptance do
 
+  desc "Run full acceptance suite"
+  task :full => [:check_env, :run_full]
+
+  desc "Run smoke tests"
+  task :smoke => [:check_env, :run_smoke]
+
   desc "shows components that can be tested separately"
   task :components do
     exec("bundle exec vagrant-spec components")
   end
 
-  desc "runs acceptance tests using vagrant-spec"
-  task :run do
-
+  desc "checks if environment variables are set"
+  task :check_env do
     yellow "NOTE: For acceptance tests to be functional, correct ssh key needs to be added to GCE metadata."
 
     if !ENV["GOOGLE_JSON_KEY_LOCATION"] && !ENV["GOOGLE_KEY_LOCATION"]
       abort ("Environment variables GOOGLE_JSON_KEY_LOCATION or GOOGLE_KEY_LOCATION are not set. Aborting.")
     end
 
-    if !ENV["GOOGLE_PROJECT_ID"]
+    unless ENV["GOOGLE_PROJECT_ID"]
       abort ("Environment variable GOOGLE_PROJECT_ID is not set. Aborting.")
     end
 
-    if !ENV["GOOGLE_CLIENT_EMAIL"]
+    unless ENV["GOOGLE_CLIENT_EMAIL"]
       abort ("Environment variable GOOGLE_CLIENT_EMAIL is not set. Aborting.")
     end
 
-    if !ENV["GOOGLE_SSH_USER"]
+    unless ENV["GOOGLE_SSH_USER"]
       puts "WARNING: GOOGLE_SSH_USER variable is not set. Will try to start tests using insecure Vagrant private key."
     end
+  end
 
+  task :run_full do
     components = %w(
+      halt
       multi_instance
       preemptible
+      reload
       scopes
       provisioner/shell
       provisioner/chef-solo
@@ -53,4 +62,15 @@ namespace :acceptance do
     puts
     exec(command)
   end
+
+  task :run_smoke do
+    components = %w(
+      provisioner/shell
+    ).map{ |s| "provider/google/#{s}" }
+
+    command = "bundle exec vagrant-spec test --components=#{components.join(" ")}"
+    puts command
+    puts
+    exec(command)
+  end
 end

data/test/acceptance/provider/halt_spec.rb

@@ -0,0 +1,34 @@
+# This tests that an instance can be halted correctly
+shared_examples 'provider/halt' do |provider, options|
+  unless options[:box]
+    raise ArgumentError,
+          "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('generic')
+    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+    assert_execute('vagrant', 'up', "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'should halt the machine and bring it back up' do
+    status("Test: machine can be halted")
+    halt_result = execute("vagrant", "halt")
+    expect(halt_result).to exit_with(0)
+
+    status("Test: machine can be brought up after halt")
+    up_result = execute("vagrant", "up")
+    expect(up_result).to exit_with(0)
+
+    status("Test: machine is running after up")
+    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(echo_result).to exit_with(0)
+    expect(echo_result.stdout).to match(/foo\n$/)
+  end
+end

data/test/acceptance/provider/multi_instance_spec.rb

@@ -1,6 +1,6 @@
 # This tests that multiple instances can be brought up correctly
 shared_examples 'provider/multi_instance' do |provider, options|
-  if !options[:box]
+  unless options[:box]
     raise ArgumentError,
           "box option must be specified for provider: #{provider}"
   end

data/test/acceptance/provider/preemptible_spec.rb

@@ -1,6 +1,6 @@
 # This tests that a preemptible instance can be brought up correctly
 shared_examples 'provider/preemptible' do |provider, options|
-  if !options[:box]
+  unless options[:box]
     raise ArgumentError,
           "box option must be specified for provider: #{provider}"
   end

data/test/acceptance/provider/reload_spec.rb

@@ -0,0 +1,29 @@
+# This tests that an instance can be reloaded correctly
+shared_examples 'provider/reload' do |provider, options|
+  unless options[:box]
+    raise ArgumentError,
+          "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('generic')
+    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+    assert_execute('vagrant', 'up', "--provider=#{provider}")
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'should reload the machine correctly' do
+    status("Test: machine can be reloaded")
+    reload_result = execute("vagrant", "reload")
+    expect(reload_result).to exit_with(0)
+
+    echo_result = execute("vagrant", "ssh", "-c", "echo foo")
+    expect(echo_result).to exit_with(0)
+    expect(echo_result.stdout).to match(/foo\n$/)
+  end
+end

data/test/acceptance/provider/scopes_spec.rb

@@ -3,7 +3,7 @@
 # available and gcloud GCE aliases can be used.
 # (see lib/fog/google/models/compute/server.rb in fog-google)
 shared_examples 'provider/scopes' do |provider, options|
-  if !options[:box]
+  unless options[:box]
     raise ArgumentError,
           "box option must be specified for provider: #{provider}"
   end

data/test/acceptance/skeletons/generic/Vagrantfile

@@ -0,0 +1,16 @@
+# This is a generic acceptance skeleton with no particular settings, set in
+# europe-west1-d zone
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "basic"
+
+  config.vm.provider :google do |google, override|
+
+    google.zone = "europe-west1-d"
+
+    google.zone_config "europe-west1-d" do |zone1d|
+      zone1d.image = "debian-7-wheezy-v20150603"
+      zone1d.zone = "europe-west1-d"
+    end
+  end
+end

data/vagrantfile_examples/Vagrantfile.multiple_machines

@@ -29,7 +29,7 @@ $GOOGLE_JSON_KEY_LOCATION = "/path/to/your/private-key.json"
 $LOCAL_USER = "mitchellh"
 $LOCAL_SSH_KEY = "~/.ssh/id_rsa"
 
-# Example Debian provistion script
+# Example Debian provision script
 $PROVISION_DEBIAN = <<SCRIPT
 uname=$(uname -a)
 ver=$(cat /etc/debian_version)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-google
@@ -87,21 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- example_boxes/README.md
-- example_boxes/gce-test/Vagrantfile
-- example_boxes/gce-test/metadata.json
-- example_boxes/gce/Vagrantfile
-- example_boxes/gce/metadata.json
-- google-test.box
-- google.box
-- lib/vagrant-google.rb
-- lib/vagrant-google/action.rb
-- lib/vagrant-google/action/connect_google.rb
+- lib/vagrant-google/action/run_instance.rb
+- lib/vagrant-google/action/sync_folders.rb
 - lib/vagrant-google/action/is_created.rb
 - lib/vagrant-google/action/is_terminated.rb
 - lib/vagrant-google/action/message_already_created.rb
@@ -109,44 +96,71 @@ files:
 - lib/vagrant-google/action/message_will_not_destroy.rb
 - lib/vagrant-google/action/read_ssh_info.rb
 - lib/vagrant-google/action/read_state.rb
-- lib/vagrant-google/action/run_instance.rb
+- lib/vagrant-google/action/timed_provision.rb
 - lib/vagrant-google/action/start_instance.rb
-- lib/vagrant-google/action/stop_instance.rb
-- lib/vagrant-google/action/sync_folders.rb
 - lib/vagrant-google/action/terminate_instance.rb
-- lib/vagrant-google/action/timed_provision.rb
+- lib/vagrant-google/action/connect_google.rb
 - lib/vagrant-google/action/warn_networks.rb
-- lib/vagrant-google/config.rb
+- lib/vagrant-google/action/stop_instance.rb
+- lib/vagrant-google/action/warn_ssh_keys.rb
+- lib/vagrant-google/util/timer.rb
+- lib/vagrant-google/provider.rb
 - lib/vagrant-google/errors.rb
+- lib/vagrant-google/action.rb
+- lib/vagrant-google/config.rb
 - lib/vagrant-google/plugin.rb
-- lib/vagrant-google/provider.rb
-- lib/vagrant-google/util/timer.rb
 - lib/vagrant-google/version.rb
+- lib/vagrant-google.rb
 - locales/en.yml
-- tasks/acceptance.rake
+- vagrantfile_examples/Vagrantfile.simple
+- vagrantfile_examples/Vagrantfile.provision_single
+- vagrantfile_examples/Vagrantfile.zone_config
+- vagrantfile_examples/Vagrantfile.multiple_machines
+- vagrant-google.gemspec
+- LICENSE
+- Vagrantfile.testing
+- Gemfile
+- example_boxes/gce/metadata.json
+- example_boxes/gce/Vagrantfile
+- example_boxes/gce-test/metadata.json
+- example_boxes/gce-test/Vagrantfile
+- example_boxes/README.md
+- CHANGELOG.md
+- google-test.box
+- vagrant-spec.config.rb
+- Vagrantfile.current
+- Vagrantfile
+- google.box
+- Rakefile
 - tasks/bundler.rake
 - tasks/lint.rake
 - tasks/test.rake
+- tasks/acceptance.rake
 - test/acceptance/base.rb
+- test/acceptance/shared/context_google.rb
+- test/acceptance/provider/halt_spec.rb
 - test/acceptance/provider/multi_instance_spec.rb
 - test/acceptance/provider/preemptible_spec.rb
+- test/acceptance/provider/reload_spec.rb
 - test/acceptance/provider/scopes_spec.rb
-- test/acceptance/shared/context_google.rb
 - test/acceptance/skeletons/multi_instance/Vagrantfile
 - test/acceptance/skeletons/preemptible/Vagrantfile
 - test/acceptance/skeletons/scopes/Vagrantfile
-- test/unit/base.rb
+- test/acceptance/skeletons/generic/Vagrantfile
 - test/unit/common/config_test.rb
-- vagrant-google.gemspec
-- vagrant-spec.config.rb
-- vagrantfile_examples/Vagrantfile.multiple_machines
-- vagrantfile_examples/Vagrantfile.provision_single
-- vagrantfile_examples/Vagrantfile.simple
-- vagrantfile_examples/Vagrantfile.zone_config
-- .gitignore
-- .rubocop.yml
+- test/unit/base.rb
+- Vagrantfile.working
+- README.md
+- lib/vagrant-google/action/._sync_folders.rb
+- lib/vagrant-google/._action.rb
 - .rubocop_todo.yml
+- ._README.md
+- ._CHANGELOG.md
 - .ruby-version
+- tasks/._acceptance.rake
+- test/acceptance/skeletons/._.DS_Store
+- .gitignore
+- .rubocop.yml
 homepage: http://www.vagrantup.com
 licenses: []
 metadata: {}