vagrant-google 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.4 (October 2014)
+
+* Add option for disk size [franzs]
+* Add tags [ptone]
+* Updated default for latest Debian image
+
 # 0.1.3 (July 2014)
 
 * Updated all image references

data/README.md

@@ -17,32 +17,19 @@ Vagrant, allowing Vagrant to control and provision instances in GCE.
 
 ## Usage
 
-Install does not yet work using standard Vagrant 1.1+ plugin installation methods.  
-To install, clone and build the repo, and install from there.  Something similar to the below
-```sh
-mkdir -p ~/tmp && cd ~/tmp
-git clone https://github.com/mitchellh/vagrant-google
-cd vagrant-google
-bundle
-rake build
-cd ~
-````
-
-# change out of the plugin source directory to avoid bundler issues
-
-```sh
-vagrant plugin install ~/tmp/vagrant-google/pkg/vagrant-google-0.1.2.gem
-```
-
-After installing, be sure to put a `Vagrant.require_plugin "vagrant-google"` at the top of your Vagrantfile so that Vagrant knows about the plugin.  
-`vagrant up` and specify the `google` provider.  For example,
+Install using standard Vagrant 1.1+ plugin installation methods.  After
+installing, `vagrant up` and specify the `google` provider.  For example,
 
 ```sh
+$ vagrant plugin install vagrant-google
+...
 $ vagrant up --provider=google
+...
 ```
 
 Of course, prior to this you'll need to obtain a GCE-compatible box file for
-Vagrant.
+Vagrant. You may also need to ensure you have a ruby-dev and other utilities
+such as GNU make installed prior to installing the plugin.
 
 ## Google Cloud Platform Setup
 
@@ -55,21 +42,21 @@ Service Account for API Access.
    `Try it now` button.
 1. Create a new project and remember to record the `Project ID` you
    specify.
-1. Next, visit the [API Console](https://code.google.com/apis/console/),
-   select `Services` and enable the `Google Compute Engine` service for
-   your project.  If prompted, review and agree to the terms of service.
-1. While still in the API Console, go to `API Access` and click on the
-   `Create another client ID...` button.  In the pop-up dialog, select
-   the `Service Account` radio button and the click the `Create client 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.
+1. While still in the Developers Console, go to `API & AUTH`, `Credentials`
+   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. Still on the same page, find the newly created `Service Account` text
-   block on the API Access page.  Record the `Email address` associated
-   with the new Service Account you just created.  You will need this
-   email address and the location of the private key file to properly
-   configure this Vagrant plugin.
+   block on the API Access page.  Record the `Email address` (it should end
+   with `@developer.gserviceaccount.com`) associated with the new Service
+   Account you just created.  You will need this email address and the
+   location of the private key file to properly configure this Vagrant plugin.
 
 ## Quick Start
 
@@ -105,7 +92,7 @@ end
 
 And then run `vagrant up --provider=google`.
 
-This will start an Debian 7 (Wheezy) instance in the us-central1-a zone,
+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.
@@ -137,10 +124,12 @@ This provider exposes quite a few provider-specific configuration options:
 * `instance_ready_timeout` - The number of seconds to wait for the instance
   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.
 * `metadata` - Custom key/value pairs of metadata to add to the instance.
 * `name` - The name of your instance.  The default is "new".
 * `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.
 
 These can be set like typical provider-specific configuration:
@@ -173,14 +162,15 @@ Vagrant.configure("2") do |config|
     google.google_key_location = "/tmp/private-key.p12"
 
     # Make sure to set this to trigger the zone_config
-    google.zone = "us-central2-a"
-
-    google.zone_config "us-central2-a" do |zone2a|
-        zone2a.name = "testing-vagrant"
-        zone2a.image = "debian-7-wheezy-v20140619"
-        zone2a.machine_type = "n1-standard-4"
-        zone2a.zone = "us-central2-a"
-        zone2a.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
+    google.zone = "us-central1-f"
+
+    google.zone_config "us-central1-f" do |zone1f|
+        zone1f.name = "testing-vagrant"
+        zone1f.image = "debian-7-wheezy-v20140926"
+        zone1f.machine_type = "n1-standard-4"
+        zone1f.zone = "us-central1-f"
+        zone1f.metadata = {'custom' => 'metadata', 'testing' => 'foobarbaz'}
+        zone1f.tags = ['web', 'app1']
     end
   end
 end
@@ -211,9 +201,7 @@ puppet) to work!
 
 ## Known Issues
 
-* Can't boot from persistent disk - The underlying fog library does not
-  currently support booting from a persistent disk.
-* No Tags - Tag support does not yet exist in the underlying fog library.
+* https://github.com/mitchellh/vagrant-google/issues/17
 
 ## Development
 

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

@@ -39,22 +39,26 @@ module VagrantPlugins
           image              = zone_config.image
           name               = zone_config.name
           machine_type       = zone_config.machine_type
+          disk_size          = zone_config.disk_size
           network            = zone_config.network
           metadata           = zone_config.metadata
+          tags               = zone_config.tags
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_google.launching_instance"))
-          env[:ui].info(" -- Name: #{name}")
-          env[:ui].info(" -- Type: #{machine_type}")
-          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(" -- 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}'")
           begin
             request_start_time = Time.now().to_i
             disk = env[:google_compute].disks.create(
                 name: name,
-                size_gb: 10,
+                size_gb: disk_size,
                 zone_name: zone,
                 source_image: image
             )
@@ -64,9 +68,11 @@ module VagrantPlugins
               :name               => name,
               :zone_name          => zone,
               :machine_type       => machine_type,
+              :disk_size          => disk_size,
               :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)],

data/lib/vagrant-google/config.rb

@@ -41,6 +41,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :machine_type
 
+      # The size of disk in GB
+      #
+      # @return [Int]
+      attr_accessor :disk_size
+
       # The user metadata string
       #
       # @return [Hash<String, String>]
@@ -56,6 +61,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :network
 
+      # Tags to apply to the instance
+      #
+      # @return [Array]
+      attr_accessor :tags
+
       # The timeout value waiting for instance ready
       #
       # @return [Int]
@@ -68,7 +78,7 @@ module VagrantPlugins
       #attr_accessor :tags
 
       # The zone to launch the instance into. If nil, it will
-      # use the default us-central1-a.
+      # use the default us-central1-f.
       #
       # @return [String]
       attr_accessor :zone
@@ -79,9 +89,11 @@ module VagrantPlugins
         @google_project_id   = UNSET_VALUE
         @image               = UNSET_VALUE
         @machine_type        = UNSET_VALUE
+        @disk_size           = UNSET_VALUE
         @metadata            = {}
         @name                = UNSET_VALUE
         @network             = UNSET_VALUE
+        @tags                = []
         @instance_ready_timeout = UNSET_VALUE
         @zone                = UNSET_VALUE
 
@@ -97,8 +109,8 @@ module VagrantPlugins
       # configuration object. This allows the user to override things like
       # image and machine type name for zones. Example:
       #
-      #     google.zone_config "us-central1-a" do |zone|
-      #       zone.image = "debian-7-wheezy-v20140619"
+      #     google.zone_config "us-central1-f" do |zone|
+      #       zone.image = "debian-7-wheezy-v20140926"
       #       zone.machine_type = "n1-standard-4"
       #     end
       #
@@ -161,11 +173,14 @@ module VagrantPlugins
         @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-v20140619" if @image == UNSET_VALUE
+        @image = "debian-7-wheezy-v20140926" if @image == UNSET_VALUE
 
         # Default instance type is an n1-standard-1
         @machine_type = "n1-standard-1" if @machine_type == UNSET_VALUE
 
+        # Default disk size is 10 GB
+        @disk_size = 10 if @disk_size == 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
@@ -173,8 +188,8 @@ module VagrantPlugins
         # Network defaults to 'default'
         @network = "default" if @network == UNSET_VALUE
 
-        # Default zone is us-central1-a.
-        @zone = "us-central1-a" if @zone == UNSET_VALUE
+        # Default zone is us-central1-f.
+        @zone = "us-central1-f" if @zone == UNSET_VALUE
 
         # Default instance_ready_timeout
         @instance_ready_timeout = 20 if @instance_ready_timeout == UNSET_VALUE

data/lib/vagrant-google/version.rb

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

data/spec/vagrant-google/config_spec.rb

@@ -30,12 +30,14 @@ describe VagrantPlugins::Google::Config do
     t = Time.now
 
     its("name")              { should == "i-#{t.year}#{t.month.to_s.rjust(2,'0')}#{t.day.to_s.rjust(2,'0')}#{t.hour.to_s.rjust(2,'0')}" }
-    its("image")             { should == "debian-7-wheezy-v20140619" }
-    its("zone")              { should == "us-central1-a" }
+    its("image")             { should == "debian-7-wheezy-v20140926" }
+    its("zone")              { should == "us-central1-f" }
     its("network")           { should == "default" }
     its("machine_type")      { should == "n1-standard-1" }
+    its("disk_size")         { should == 10 }
     its("instance_ready_timeout") { should == 20 }
     its("metadata")          { should == {} }
+    its("tags")              { should == [] }
   end
 
   describe "overriding defaults" do
@@ -43,8 +45,8 @@ describe VagrantPlugins::Google::Config do
     # simple boilerplate test, so I cut corners here. It just sets
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
-    [:name, :image, :zone, :instance_ready_timeout, :machine_type, :network,
-      :metadata].each do |attribute|
+    [:name, :image, :zone, :instance_ready_timeout, :machine_type, :disk_size,
+      :network, :metadata].each do |attribute|
 
       it "should not default #{attribute} if overridden" do
         instance.send("#{attribute}=".to_sym, "foo")
@@ -86,6 +88,7 @@ describe VagrantPlugins::Google::Config do
   describe "zone config" do
     let(:config_image)           { "foo" }
     let(:config_machine_type)    { "foo" }
+    let(:config_disk_size)       { 99 }
     let(:config_name)            { "foo" }
     let(:config_zone)            { "foo" }
     let(:config_network)         { "foo" }
@@ -95,11 +98,12 @@ describe VagrantPlugins::Google::Config do
       instance.network           = config_network
       instance.image             = config_image
       instance.machine_type      = config_machine_type
+      instance.disk_size         = config_disk_size
       instance.zone              = config_zone
     end
 
     it "should raise an exception if not finalized" do
-      expect { instance.get_zone_config("us-central1-a") }.
+      expect { instance.get_zone_config("us-central1-f") }.
         to raise_error
     end
 
@@ -112,12 +116,13 @@ describe VagrantPlugins::Google::Config do
         instance.finalize!
 
         # Get a lower level zone
-        instance.get_zone_config("us-central1-a")
+        instance.get_zone_config("us-central1-f")
       end
 
       its("name")              { should == config_name }
       its("image")             { should == config_image }
       its("machine_type")      { should == config_machine_type }
+      its("disk_size")         { should == config_disk_size }
       its("network")           { should == config_network }
       its("zone")              { should == config_zone }
     end
@@ -141,6 +146,7 @@ describe VagrantPlugins::Google::Config do
       its("name")              { should == config_name }
       its("image")             { should == config_image }
       its("machine_type")      { should == config_machine_type }
+      its("disk_size")         { should == config_disk_size }
       its("network")           { should == config_network }
       its("zone")              { should == zone_name }
     end
@@ -168,9 +174,9 @@ describe VagrantPlugins::Google::Config do
     describe "shortcut configuration" do
       subject do
         # Use the shortcut configuration to set some values
-        instance.zone_config "us-central1-a", :image => "child"
+        instance.zone_config "us-central1-f", :image => "child"
         instance.finalize!
-        instance.get_zone_config("us-central1-a")
+        instance.get_zone_config("us-central1-f")
       end
 
       its("image") { should == "child" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-google
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -113,38 +113,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- google.box
+- Rakefile
 - README.md
-- CONTRIB.md
-- example_box/README.md
-- example_box/metadata.json
-- spec/vagrant-google/config_spec.rb
+- vagrant-google.gemspec
+- locales/en.yml
 - CHANGELOG.md
-- Gemfile
 - LICENSE
-- locales/en.yml
-- vagrant-google.gemspec
-- Rakefile
-- lib/vagrant-google/version.rb
+- CONTRIB.md
+- Gemfile
 - lib/vagrant-google/action.rb
-- lib/vagrant-google/provider.rb
-- lib/vagrant-google/config.rb
-- lib/vagrant-google/util/timer.rb
-- lib/vagrant-google/action/read_ssh_info.rb
+- lib/vagrant-google/action/run_instance.rb
 - lib/vagrant-google/action/timed_provision.rb
-- lib/vagrant-google/action/message_already_created.rb
 - lib/vagrant-google/action/terminate_instance.rb
-- lib/vagrant-google/action/read_state.rb
+- lib/vagrant-google/action/read_ssh_info.rb
 - lib/vagrant-google/action/message_not_created.rb
 - lib/vagrant-google/action/connect_google.rb
-- lib/vagrant-google/action/sync_folders.rb
-- lib/vagrant-google/action/run_instance.rb
 - lib/vagrant-google/action/is_created.rb
-- lib/vagrant-google/action/warn_networks.rb
 - lib/vagrant-google/action/message_will_not_destroy.rb
-- lib/vagrant-google/errors.rb
+- lib/vagrant-google/action/warn_networks.rb
+- lib/vagrant-google/action/read_state.rb
+- lib/vagrant-google/action/sync_folders.rb
+- lib/vagrant-google/action/message_already_created.rb
+- lib/vagrant-google/config.rb
 - lib/vagrant-google/plugin.rb
+- lib/vagrant-google/version.rb
+- lib/vagrant-google/provider.rb
+- lib/vagrant-google/errors.rb
+- lib/vagrant-google/util/timer.rb
 - lib/vagrant-google.rb
+- example_box/README.md
+- example_box/metadata.json
+- google.box
+- spec/vagrant-google/config_spec.rb
 - .gitignore
 homepage: http://www.vagrantup.com
 licenses: []
@@ -158,9 +158,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -62560400084090535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: