vagrant-gq 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b7326e9122dddb90b503a3c8b2d44ae1db5f7b
-  data.tar.gz: 2b8cbadc9c5fd36d210dcb829c9fea345b897d5a
+  metadata.gz: f2a1bd1157bf3ea8feff9f1a7b25b257f23c4ac1
+  data.tar.gz: db6cd32f46ae91fd45bbcff96384dfc4839856c2
 SHA512:
-  metadata.gz: 04f8922a61965f1718456716d31e79eff96800696acfe5a8e584026fc5f4901c9952e6913e74d73b0e9b2e5681eba50b07601b6478b6c7cd029c2efa3aa9ac89
-  data.tar.gz: 7119e7d95520fd4f2003c9043e3844e96c0008317599dbb861bb0fa887ce1de88b65aadd7616279dcfeabbf3856790f2cc9502cdbd8b4393f46bb3483bd41c4c
+  metadata.gz: c7b71142064c96ec8f91233522b75d7d1fb1ad5054305035599a2362e9256fbe168cd9515a50ad464853d3e9eafbbc611b98978600fcbec269b6af0653b29619
+  data.tar.gz: 9ceb560d9cc9bbce9e9501790c35b90e8456689db2d1701eaf2cfb09aa2370e622260d5e8696a2bd8ca38fdd1fc7a1a82af0512414ada8b7b81223b007708686

data/README.md

@@ -1,4 +1,4 @@
-# Vagrant GQ Provider 
+# Vagrant GQ Provider
 
 This is a [Vagrant](http://www.vagrantup.com) 1.2+ plugin that adds a [GreenQloud](http://www.greenqloud.com)
 provider to Vagrant, allowing Vagrant to control and provision machines in GreenQloud.
@@ -27,8 +27,9 @@ $ vagrant up --provider=gq
 ...
 ```
 
-Of course prior to doing this, you'll need to obtain an GreenQloud compatible
-box file for Vagrant.
+Prior to doing this, you'll need to obtain a GreenQloud compatible
+box file for Vagrant. See the Quick Start below for an example using the
+greenqloud-generic.box.
 
 ## Quick Start
 
@@ -56,9 +57,9 @@ end
 
 And then run `vagrant up --provider=gq`.
 
-This will start an Ubuntu 14.04 instance in the within your account. 
-And assuming your SSH information was filled in properly within your 
-Vagrantfile, SSH and provisioning will work as well.
+This will start a Ubuntu 14.04 instance within your account. Assuming
+your SSH information was filled in properly, 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 "generic" box, has
@@ -84,8 +85,6 @@ This provider exposes quite a few provider-specific configuration options:
 
 * `access_key_id` - The access key for accessing GreenQloud
 * `qmi` - The QMI id to boot, such as "qmi-12345678"
-* `availability_zone` - The availability zone within the region to launch
-  the instance. If nil, it will use the default set by Amazon.
 * `instance_ready_timeout` - The number of seconds to wait for the instance
   to become "ready" in GreenQloud. Defaults to 120 seconds.
 * `instance_type` - The type of instance, such as "m1.small". The default
@@ -94,7 +93,6 @@ This provider exposes quite a few provider-specific configuration options:
    which support it.
 * `secret_access_key` - The secret access key for accessing GreenQloud
 * `security_groups` - An array of security groups for the instance.
-* `tags` - A hash of tags to set on the machine.
 
 These can be set like typical provider-specific configuration:
 
@@ -126,26 +124,7 @@ the remote machine over SSH.
 This is good enough for all built-in Vagrant provisioners (shell,
 chef, and puppet) to work!
 
-## Other Examples
-
-### Tags
-
-To use tags, simply define a hash of key/value for the tags you want to associate to your instance, like:
-
-```ruby
-Vagrant.configure("2") do |config|
-  # ... other stuff
-
-  config.vm.provider :gq do |gq|
-    gq.tags = {
-	  'Name' => 'Some Name',
-	  'Some Key' => 'Some Value'
-    }
-  end
-end
-```
-
-### User data
+## User data
 
 You can specify user data for the instance being booted.
 

data/Vagrantfile.stock

@@ -0,0 +1,12 @@
+Vagrant.configure("2") do |config|
+    config.vm.box = "greenqloud-generic"
+    config.vm.box_url = "https://vagrant.s.greenqloud.com/greenqloud-generic.box"
+
+    config.vm.provider "gq" do |gq|
+        gq.qmi = "qmi-60ce3bb8"
+        gq.keypair_name = "default"
+        config.ssh.username = "ubuntu"
+        config.ssh.private_key_path = "/Users/ragnarb/.gq-ragnarb/default_ssh.id"
+    end
+end
+

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

@@ -92,7 +92,7 @@ module VagrantPlugins
             env[:ui].warn(I18n.t("vagrant_gq.warn_ssh_access")) unless allows_ssh_port?(env, security_groups, subnet_id)
 
             server = env[:gq_compute].servers.create(options)
-          rescue Fog::Compute::GQ::NotFound => e
+          rescue Fog::Compute::AWS::NotFound => e
             # Invalid subnet doesn't have its own error so we catch and
             # check the error message here.
             if e.message =~ /subnet ID/
@@ -101,7 +101,7 @@ module VagrantPlugins
             end
 
             raise
-          rescue Fog::Compute::GQ::Error => e
+          rescue Fog::Compute::AWS::Error => e
             raise Errors::FogError, :message => e.message
           rescue Excon::Errors::HTTPStatusError => e
             raise Errors::InternalFogError,

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

@@ -49,7 +49,7 @@ module VagrantPlugins
                   timeout: region_config.instance_ready_timeout
               end
             end
-          rescue Fog::Compute::GQ::Error => e
+          rescue Fog::Compute::AWS::Error => e
             raise Errors::FogError, :message => e.message
           end
 

data/lib/vagrant-gq/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GQ
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-gq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - GreenQloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -86,11 +86,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".Vagrantfile.swp"
 - ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- Vagrantfile.stock
 - example_box/README.md
 - example_box/metadata.json
 - greenqloud-generic.box