vagrant-google 0.1.4 → 0.1.5.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1579f21e576ddd84be0534329d26b18519f25a3c
+  data.tar.gz: 4bca2bc0bc4be2b3bf8dc0e41fcd44ccd80aa49d
+SHA512:
+  metadata.gz: 950faaf3aa714e6599d15292af92b66f3f1f23c621873b5f2ca724c4ad3a0f014ab726dbddd79400644b64e7af123fd48ec49ff84ce408de7d8b0183b55964ce
+  data.tar.gz: aac7d0ae3087361428a9556826b7b7ab20d863b81067da24f61867aef93cabc5c237aa0eaac640b856a7b377ca71a5069c9c6f234c361677235d09f5075df6d8

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p598

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.1.5 (May 2015)
+
+* Added support for JSON private keys [temikus]
+* Added disk_type parameter support [temikus]
+* Added acceptance tests [temikus]
+* Added can_ip_forward, external_ip, autodelete_disk and disk_name parameters support [phueper]
+* Added support for user specified rsync excludes [patkar]
+* Miscellaneous bugfixes [mbrukman, beauzeaux, iceydee, mklbtz, temikus]
+
 # 0.1.4 (October 2014)
 
 * Add option for disk size [franzs]

data/Gemfile

@@ -1,11 +1,11 @@
 # Copyright 2013 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.
@@ -20,5 +20,10 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.2.7"
+  gem 'vagrant', git: "git://github.com/mitchellh/vagrant.git"
+  gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
+end
+
+group :plugins do
+  gem "vagrant-google" , path: "."
 end

data/README.md

@@ -40,8 +40,7 @@ Service Account for API Access.
 1. Log in with your Google Account and go to
    [Google Cloud Platform](https://cloud.google.com) and click on the
    `Try it now` button.
-1. Create a new project and remember to record the `Project ID` you
-   specify.
+1. Create a new project and remember to record the `Project ID`
 1. Next, visit the [Developers Console](https://console.developers.google.com)
    make sure to enable the `Google Compute Engine` service for your project
    If prompted, review and agree to the terms of service.
@@ -49,9 +48,9 @@ Service Account for API Access.
    section and click the `Create new Client ID` button.  In the pop-up dialog,
    select the `Service Account` radio button and the click the `Create Client ID`
    button.
-1. When prompted, select the `Download private key` button and make sure
-   to save this file in a secure and reliable location.  This key file
-   will be used to authorize all Vagrant commands available in this plugin.
+1. Make sure to download the *P12 private key* and save this file in a secure
+   and reliable location.  This key file will be used to authorize all API
+   requests to Google Compute Engine.
 1. Still on the same page, find the newly created `Service Account` text
    block on the API Access page.  Record the `Email address` (it should end
    with `@developer.gserviceaccount.com`) associated with the new Service
@@ -80,7 +79,7 @@ Vagrant.configure("2") do |config|
   config.vm.provider :google do |google, override|
     google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
     google.google_client_email = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
-    google.google_key_location = "/PATH/TO/YOUR/PRIVATE_KEY.p12"
+    google.google_json_key_location = "/path/to/your/private-key.json"
 
     override.ssh.username = "USERNAME"
     override.ssh.private_key_path = "~/.ssh/id_rsa"
@@ -94,13 +93,36 @@ And then run `vagrant up --provider=google`.
 
 This will start an Debian 7 (Wheezy) instance in the us-central1-f zone,
 with an n1-standard-1 machine, and the "default" network within your project.
-And assuming your SSH information was filled in properly within your
-Vagrantfile, SSH and provisioning will work as well.
+And assuming your SSH information (see below) was filled in properly within
+your Vagrantfile, SSH and provisioning will work as well.
 
 Note that normally a lot of this boilerplate is encoded within the box file,
 but the box file used for the quick start, the "google" box, has no
 preconfigured defaults.
 
+## SSH Support
+
+In order for SSH to work properly to the GCE VM, you will first need to add
+your public key to the GCE metadata service for the desired VM user account.
+When a VM first boots, a Google-provided daemon is responsible for talking to
+the internal GCE metadata service and creates local user accounts and their
+respective `~/.ssh/authorized_keys` entries.  Most new GCE users will use the
+[Cloud SDK](https://cloud.google.com/sdk/) `gcloud compute` utility when first
+getting started with GCE. This utility has built in support for creating SSH
+key pairs, and uploading the public key to the GCE metadata service.  By
+default, `glcoud compute` creates a key pair named
+`~/.ssh/google_compute_engine[.pub]`.
+
+Note that you can use the more standard `~/.ssh/id_rsa[.pub]` files, but you
+will need to manually add your public key to the GCE metadata service so your
+VMs will pick up the the key. Note that they public key is typically
+prefixed with the username, so that the daemon on the VM adds the public key
+to the correct user account.  See the blow links for more help with SSH and
+GCE VMs.
+
+  * https://cloud.google.com/compute/docs/instances#sshing
+  * https://cloud.google.com/compute/docs/console#sshkeys
+
 ## Box Format
 
 Every provider in Vagrant must introduce a custom box format. This provider
@@ -117,7 +139,9 @@ configuration for this provider.
 This provider exposes quite a few provider-specific configuration options:
 
 * `google_client_email` - The Client Email address for your Service Account.
-* `google_key_location` - The location to the private key file matching your
+* `google_key_location` - The location of the P12 private key file matching your
+  Service Account.
+* `google_json_key_location` - The location of the JSON private key file matching your
   Service Account.
 * `google_project_id` - The Project ID for your Google Cloud Platform account.
 * `image` - The image name to use when booting your instance.
@@ -125,12 +149,15 @@ This provider exposes quite a few provider-specific configuration options:
   to become "ready" in GCE. Defaults to 20 seconds.
 * `machine_type` - The machine type to use.  The default is "n1-standard-1".
 * `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 "new".
+* `name` - The name of your instance.  The default is "i-yyyyMMddHH". Example 2014/10/01 10:00:00 is "i-2014100101".
 * `network` - The name of the network to use for the instance.  Default is
  "default".
 * `tags` - An array of tags to apply to this instance.
 * `zone` - The zone name where the instance will be created.
+* `can_ip_forward` - Boolean wether to enable IP Forwarding.
+* `external_ip` - The external IP address to use.
 
 These can be set like typical provider-specific configuration:
 
@@ -139,9 +166,9 @@ Vagrant.configure("2") do |config|
   # ... other stuff
 
   config.vm.provider :google do |google|
-    google.google_project_id = "my_project"
-    google.google_client_email = "hashstring@example.com"
-    google.google_key_location = "/tmp/private-key.p12"
+    google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
+    google.google_client_email = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
+    google.google_json_key_location = "/path/to/your/private-key.json"
   end
 end
 ```
@@ -157,16 +184,16 @@ Vagrant.configure("2") do |config|
   config.vm.box = "gce"
 
   config.vm.provider :google do |google|
-    google.google_project_id = "my_project"
-    google.google_client_email = "hashstring@example.com"
-    google.google_key_location = "/tmp/private-key.p12"
+    google.google_project_id = "YOUR_GOOGLE_CLOUD_PROJECT_ID"
+    google.google_client_email = "YOUR_SERVICE_ACCOUNT_EMAIL_ADDRESS"
+    google.google_json_key_location = "/path/to/your/private-key.json"
 
     # Make sure to set this to trigger the zone_config
     google.zone = "us-central1-f"
 
     google.zone_config "us-central1-f" do |zone1f|
         zone1f.name = "testing-vagrant"
-        zone1f.image = "debian-7-wheezy-v20140926"
+        zone1f.image = "debian-7-wheezy-v20150127"
         zone1f.machine_type = "n1-standard-4"
         zone1f.zone = "us-central1-f"
         zone1f.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
@@ -199,10 +226,6 @@ machine over SSH.
 This is good enough for all built-in Vagrant provisioners (shell, chef, and
 puppet) to work!
 
-## Known Issues
-
-* https://github.com/mitchellh/vagrant-google/issues/17
-
 ## Development
 
 To work on the `vagrant-google` plugin, clone this repository out, and use
@@ -227,11 +250,31 @@ that uses it, and uses bundler to execute Vagrant:
 $ bundle exec vagrant up --provider=google
 ```
 
+## Acceptance testing
+
+**Work-in-progress:** Acceptance tests are based on vagrant-spec library which
+is currently under active development so they may occasionally break.
+
+Before you start acceptance tests, you'll need to set the authentication variables accordingly.
+
+Next, export your GCP authentication data:
+
+```
+export GOOGLE_CLIENT_EMAIL="your-google_service_account_email@developer.gserviceaccount.com"
+export GOOGLE_PROJECT_ID="your-google-cloud-project-id"
+export GOOGLE_JSON_KEY_LOCATION="/full/path/to/your/private-key.json"
+
+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` namespace:
+```
+bundle exec rake acceptance:run
+```
+
 ## Changelog
  * See [CHANGELOG.md](https://github.com/mitchellh/vagrant-google/blob/master/CHANGELOG.md)
 
-## Contributing
- * See [CONTRIB.md](https://github.com/mitchellh/vagrant-google/blob/master/CONTRIB.md)
-
 ## Licensing
  * See [LICENSE](https://github.com/mitchellh/vagrant-google/blob/master/LICENSE)

data/Rakefile

@@ -1,11 +1,11 @@
 # Copyright 2013 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.
@@ -14,22 +14,19 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'rspec/core/rake_task'
 
 # Immediately sync all stdout so that tools like buildbot can
 # immediately load in the output.
 $stdout.sync = true
 $stderr.sync = true
 
-# Change to the directory of this file.
-Dir.chdir(File.expand_path("../", __FILE__))
+# Load all the rake tasks from the "tasks" folder. This folder
+# allows us to nicely separate rake tasks into individual files
+# based on their role, which makes development and debugging easier
+# than one monolithic file.
+task_dir = File.expand_path("../tasks", __FILE__)
+Dir["#{task_dir}/**/*.rake"].each do |task_file|
+  load task_file
+end
 
-# This installs the tasks that help with gem creation and
-# publishing.
-Bundler::GemHelper.install_tasks
-
-# Install the `spec` task so that we can run tests.
-RSpec::Core::RakeTask.new
-
-# Default task is to run the unit tests
-task :default => "spec"
+task default: "test:unit"

data/{example_box → example_boxes}/README.md

@@ -5,7 +5,7 @@ This folder shows the example contents of a box for the `google` provider.
 To turn this into a box:
 
 ```
-$ tar cvzf ../google.box ./metadata.json ./Vagrantfile
+$ tar cvzf ../../google.box ./metadata.json ./Vagrantfile
 ```
 
 This box works by using Vagrant's built-in Vagrantfile merging to setup

data/example_boxes/gce/metadata.json

@@ -0,0 +1,3 @@
+{
+    "provider": "google"
+}

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

@@ -29,13 +29,21 @@ module VagrantPlugins
         def call(env)
           provider_config = env[:machine].provider_config
 
-          # Build the fog config
-          fog_config = {
-            :provider            => :google,
-            :google_project      => provider_config.google_project_id,
-            :google_client_email => provider_config.google_client_email,
-            :google_key_location => provider_config.google_key_location
-          }
+          unless provider_config.google_json_key_location.nil?
+            fog_config = {
+              :provider            => :google,
+              :google_project      => provider_config.google_project_id,
+              :google_client_email => provider_config.google_client_email,
+              :google_json_key_location => provider_config.google_json_key_location
+            }
+          else
+            fog_config = {
+              :provider            => :google,
+              :google_project      => provider_config.google_project_id,
+              :google_client_email => provider_config.google_client_email,
+              :google_key_location => provider_config.google_key_location
+            }
+          end
 
           @logger.info("Connecting to Google...")
           env[:google_compute] = Fog::Compute.new(fog_config)

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

@@ -40,42 +40,90 @@ module VagrantPlugins
           name               = zone_config.name
           machine_type       = zone_config.machine_type
           disk_size          = zone_config.disk_size
+          disk_name          = zone_config.disk_name
+          disk_type          = zone_config.disk_type
           network            = zone_config.network
           metadata           = zone_config.metadata
           tags               = zone_config.tags
+          can_ip_forward     = zone_config.can_ip_forward
+          external_ip        = zone_config.external_ip
+          autodelete_disk    = zone_config.autodelete_disk
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_google.launching_instance"))
-          env[:ui].info(" -- Name:      #{name}")
-          env[:ui].info(" -- Type:      #{machine_type}")
-          env[:ui].info(" -- Disk size: #{disk_size} GB")
-          env[:ui].info(" -- Image:     #{image}")
-          env[:ui].info(" -- Zone:      #{zone}") if zone
-          env[:ui].info(" -- Network:   #{network}") if network
-          env[:ui].info(" -- Metadata:  '#{metadata}'")
-          env[:ui].info(" -- Tags:      '#{tags}'")
+          env[:ui].info(" -- Name:            #{name}")
+          env[:ui].info(" -- Type:            #{machine_type}")
+          env[:ui].info(" -- Disk type:       #{disk_type}")
+          env[:ui].info(" -- Disk size:       #{disk_size} GB")
+          env[:ui].info(" -- Disk name:       #{disk_name}")
+          env[:ui].info(" -- Image:           #{image}")
+          env[:ui].info(" -- Zone:            #{zone}") if zone
+          env[:ui].info(" -- Network:         #{network}") if network
+          env[:ui].info(" -- Metadata:        '#{metadata}'")
+          env[:ui].info(" -- Tags:            '#{tags}'")
+          env[:ui].info(" -- IP Forward:      #{can_ip_forward}")
+          env[:ui].info(" -- External IP:     #{external_ip}")
+          env[:ui].info(" -- Autodelete Disk: #{autodelete_disk}")
           begin
             request_start_time = Time.now().to_i
-            disk = env[:google_compute].disks.create(
-                name: name,
-                size_gb: disk_size,
-                zone_name: zone,
-                source_image: image
-            )
-            disk.wait_for { disk.ready? }
+            if !external_ip.nil?
+              address = env[:google_compute].addresses.get_by_ip_address(external_ip)
+              if !address.nil?
+                if address.in_use?
+                  raise Errors::ExternalIpError,
+                    :externalip => external_ip
+                end
+              end
+            end
+            #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
+
+            if disk_name.nil?
+              # no disk_name... disk_name defaults to instance name
+              disk = env[:google_compute].disks.create(
+                  name: name,
+                  size_gb: disk_size,
+                  type: disk_type,
+                  zone_name: zone,
+                  source_image: image
+              )
+              disk.wait_for { disk.ready? }
+            else
+              disk = env[:google_compute].disks.get(disk_name, zone)
+              if disk.nil?
+                # disk not found... create it with name
+                disk = env[:google_compute].disks.create(
+                    name: disk_name,
+                    size_gb: disk_size,
+                    type: disk_type,
+                    zone_name: zone,
+                    source_image: image
+                )
+                disk.wait_for { disk.ready? }
+              end
+            end
 
             defaults = {
               :name               => name,
               :zone_name          => zone,
               :machine_type       => machine_type,
               :disk_size          => disk_size,
+              :disk_type          => disk_type,
               :image              => image,
               :network            => network,
               :metadata           => metadata,
               :tags               => tags,
-              # Second arg to get_as_boot_disk is 'autodelete_disk', defaulting
-              # to true
-              :disks              => [disk.get_as_boot_disk(true, true)],
+              :can_ip_forward     => can_ip_forward,
+              :external_ip        => external_ip,
+              :disks              => [disk.get_as_boot_disk(true, autodelete_disk)],
             }
             server = env[:google_compute].servers.create(defaults)
             @logger.info("Machine '#{zone}:#{name}' created.")

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

@@ -14,6 +14,7 @@
 require "log4r"
 require "vagrant/util/subprocess"
 require "vagrant/util/scoped_hash_override"
+require "vagrant/util/which"
 
 module VagrantPlugins
   module Google
@@ -38,6 +39,11 @@ module VagrantPlugins
 
             # Ignore disabled shared folders
             next if data[:disabled]
+            
+            unless Vagrant::Util::Which.which('rsync')
+              env[:ui].warn(I18n.t('vagrant_aws.rsync_not_found_warning'))
+              break
+            end
 
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
@@ -46,6 +52,11 @@ module VagrantPlugins
             # avoid creating an additional directory with rsync
             hostpath = "#{hostpath}/" if hostpath !~ /\/$/
 
+            # on windows rsync.exe requires cygdrive-style paths
+            if Vagrant::Util::Platform.windows?
+              hostpath = hostpath.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+            end
+
             env[:ui].info(I18n.t("vagrant_google.rsync_folder",
                                 :hostpath => hostpath,
                                 :guestpath => guestpath))
@@ -61,14 +72,23 @@ module VagrantPlugins
               Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join
             end
 
+            #collect rsync excludes specified :rsync__excludes=>['path1',...] in synced_folder options
+            excludes = ['.vagrant/', *Array(data[:rsync__excludes])]
+
             # Rsync over to the guest path using the SSH info
             command = [
               "rsync", "--verbose", "--archive", "-z",
-              "--exclude", ".vagrant/",
+              *excludes.map{|e|['--exclude', e]}.flatten,
               "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
+            # we need to fix permissions when using rsync.exe on windows, see
+            # http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+            if Vagrant::Util::Platform.windows?
+              command.insert(1, "--chmod", "ugo=rwX")
+            end
+
             r = Vagrant::Util::Subprocess.execute(*command)
             if r.exit_code != 0
               raise Errors::RsyncError,

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

@@ -27,8 +27,9 @@ module VagrantPlugins
           server = env[:google_compute].servers.get(env[:machine].id, env[:machine].provider_config.zone)
 
           # 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 if not server.nil?
+          server.destroy(false) if not server.nil?
           env[:machine].id = nil
 
           @app.call(env)

data/lib/vagrant-google/action.rb

@@ -104,7 +104,7 @@ module VagrantPlugins
       # This action is called to bring the box up from nothing.
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
-          b.use HandleBoxUrl
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectGoogle
           b.use Call, IsCreated do |env, b2|

data/lib/vagrant-google/config.rb

@@ -26,6 +26,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :google_key_location
 
+      # The path to the Service Account json-formatted private key
+      #
+      # @return [String]
+      attr_accessor :google_json_key_location
+
       # The Google Cloud Project ID (not name or number)
       #
       # @return [String]
@@ -46,6 +51,16 @@ module VagrantPlugins
       # @return [Int]
       attr_accessor :disk_size
 
+      # The name of the disk to be used, it it exists, it will be reused, otherwise created.
+      #
+      # @return [String]
+      attr_accessor :disk_name
+
+      # The type of the disk to be used, such as "pd-standard"
+      #
+      # @return [String]
+      attr_accessor :disk_type
+
       # The user metadata string
       #
       # @return [Hash<String, String>]
@@ -66,6 +81,21 @@ module VagrantPlugins
       # @return [Array]
       attr_accessor :tags
 
+      # wether to enable ip forwarding
+      #
+      # @return Boolean
+      attr_accessor :can_ip_forward
+
+      # The external IP Address to use
+      #
+      # @return String
+      attr_accessor :external_ip
+
+      # wether to autodelete disk on instance delete
+      #
+      # @return Boolean
+      attr_accessor :autodelete_disk
+
       # The timeout value waiting for instance ready
       #
       # @return [Int]
@@ -86,14 +116,20 @@ module VagrantPlugins
       def initialize(zone_specific=false)
         @google_client_email = UNSET_VALUE
         @google_key_location = UNSET_VALUE
+        @google_json_key_location = UNSET_VALUE
         @google_project_id   = UNSET_VALUE
         @image               = UNSET_VALUE
         @machine_type        = UNSET_VALUE
         @disk_size           = UNSET_VALUE
+        @disk_name           = UNSET_VALUE
+        @disk_type           = UNSET_VALUE
         @metadata            = {}
         @name                = UNSET_VALUE
         @network             = UNSET_VALUE
         @tags                = []
+        @can_ip_forward      = UNSET_VALUE
+        @external_ip         = UNSET_VALUE
+        @autodelete_disk     = UNSET_VALUE
         @instance_ready_timeout = UNSET_VALUE
         @zone                = UNSET_VALUE
 
@@ -110,7 +146,7 @@ module VagrantPlugins
       # image and machine type name for zones. Example:
       #
       #     google.zone_config "us-central1-f" do |zone|
-      #       zone.image = "debian-7-wheezy-v20140926"
+      #       zone.image = "debian-7-wheezy-v20150127"
       #       zone.machine_type = "n1-standard-4"
       #     end
       #
@@ -170,10 +206,11 @@ module VagrantPlugins
         # will default to nil if the environment variables are not present.
         @google_client_email = ENV['GOOGLE_CLIENT_EMAIL'] if @google_client_email == UNSET_VALUE
         @google_key_location = ENV['GOOGLE_KEY_LOCATION'] if @google_key_location == UNSET_VALUE
+        @google_json_key_location = ENV['GOOGLE_JSON_KEY_LOCATION'] if @google_json_key_location == UNSET_VALUE
         @google_project_id   = ENV['GOOGLE_PROJECT_ID'] if @google_project_id == UNSET_VALUE
 
         # Image must be nil, since we can't default that
-        @image = "debian-7-wheezy-v20140926" if @image == UNSET_VALUE
+        @image = "debian-7-wheezy-v20150127" if @image == UNSET_VALUE
 
         # Default instance type is an n1-standard-1
         @machine_type = "n1-standard-1" if @machine_type == UNSET_VALUE
@@ -181,6 +218,12 @@ module VagrantPlugins
         # Default disk size is 10 GB
         @disk_size = 10 if @disk_size == UNSET_VALUE
 
+        # Default disk name is nil
+        @disk_name = nil if @disk_name == UNSET_VALUE
+
+        # 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)
         t = Time.now
         @name = "i-#{t.year}#{t.month.to_s.rjust(2,'0')}#{t.day.to_s.rjust(2,'0')}#{t.hour.to_s.rjust(2,'0')}" if @name == UNSET_VALUE
@@ -191,6 +234,15 @@ module VagrantPlugins
         # Default zone is us-central1-f.
         @zone = "us-central1-f" if @zone == UNSET_VALUE
 
+        # autodelete_disk defaults to true
+        @autodelete_disk = true if @autodelete_disk == UNSET_VALUE
+
+        # can_ip_forward defaults to nil
+        @can_ip_forward = nil if @can_ip_forward == UNSET_VALUE
+
+        # external_ip defaults to nil
+        @external_ip = nil if @external_ip == UNSET_VALUE
+
         # Default instance_ready_timeout
         @instance_ready_timeout = 20 if @instance_ready_timeout == UNSET_VALUE
 
@@ -231,8 +283,11 @@ module VagrantPlugins
             config.google_project_id.nil?
           errors << I18n.t("vagrant_google.config.google_client_email_required") if \
             config.google_client_email.nil?
+          errors << I18n.t("vagrant_google.config.google_duplicate_key_location") if \
+            !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?
+            config.google_key_location.nil? and config.google_json_key_location.nil?
+
         end
 
         errors << I18n.t("vagrant_google.config.image_required") if config.image.nil?

data/lib/vagrant-google/errors.rb

@@ -20,6 +20,14 @@ module VagrantPlugins
         error_namespace("vagrant_google.errors")
       end
 
+      class ExternalIpError < VagrantGoogleError
+        error_key(:external_ip_error)
+      end
+
+      class DiskTypeError <VagrantGoogleError
+        error_key(:disk_type_error)
+      end
+
       class FogError < VagrantGoogleError
         error_key(:fog_error)
       end