vagrant-linode 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8ce03d21b5be2ac13a6492b31874c435dced26f
-  data.tar.gz: 4662545d18c8e288c37bb3f085306239865b8a09
+  metadata.gz: 10e005fdd16d23255cbc89613cf419a133fb729e
+  data.tar.gz: 035816e2ee03ce0698b0de6ab6c1dc0a09cd0a13
 SHA512:
-  metadata.gz: fbee5ac73c4c72a2f8518a775e895c64e420901ff3eb9e2d5dec78d3a0eb65d1cd66dc7b31dd05c754f63f2942aed694bedda10cc62e5e9ed33dad391e3b6969
-  data.tar.gz: 5f31d483d567d7bbdbb9a8548288f56748adf2172c00062a6e74c62f851e5ddf5f36723c76fb9bf4f1ef8fe2e90a1e04c2a4908980a366403a3c23ffc919c84e
+  metadata.gz: d415ef59813703bdba199ff25eabaf39296ada14651591c07c3b207186de626671d19470b48abc47e02c3711a237a8c02e780e4c5636757574b358400cc5bd57
+  data.tar.gz: 4961ed7a4f26c6e0ccf640c0b296df80104e7cc742c9661c410715dd8533b52ad73de435753ef0b98cf10e0a445f1e218658d8ed18fd6e69b4e84e8fe24f260f

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.5'
+gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
 gem 'vagrant-omnibus'
 gem 'rake'
 

data/README.md

@@ -5,21 +5,17 @@ Linode Vagrant Provider
 management of [Linode](https://www.linode.com/) linodes
 (instances).
 
-**NOTE:** The Chef provisioner is no longer supported by default (as of 0.2.0).
-Please use the `vagrant-omnibus` plugin to install Chef on Vagrant-managed
-machines. This plugin provides control over the specific version of Chef
-to install.
-
 Current features include:
 - create and destroy linodes
 - power on and off linodes
 - rebuild a linode
-- provision a linode with the shell or Chef provisioners
+- provision a linode with the shell or other provisioners
 - setup a SSH public key for authentication
 - create a new user account during linode creation
+- setup hostname during creation
 
 The provider has been tested with Vagrant 1.6.3+ using Ubuntu 14.04 LTS and
-Debian 7.5 guest operating systems.
+Debian 7.5+ guest operating systems.
 
 Install
 -------
@@ -68,6 +64,8 @@ Vagrant.configure('2') do |config|
     # provider.datacenterid = <int>
     # provider.image = <string>
     # provider.imageid = <int>
+    # provider.kernel = <string>
+    # provider.kernelid = <int>
     # provider.private_networking = <boolean>
     # provider.stackscript = <string>
     # provider.stackscriptid = <int>
@@ -82,7 +80,7 @@ Please note the following:
   your public key which is assumed to be the `private_key_path` with a *.pub*
   extension.
 - You *must* specify your Linode Personal Access Token. This may be
-  found on the control panel within the *Apps &amp; API* section.
+  found on the control panel within the *my profile* &gt; *API Keys* section.
 
 **Supported Configuration Attributes**
 
@@ -165,6 +163,20 @@ curl -X POST "https://api.linode.com/?api_action=avail.datacenters" \
 
 More detail: [Linode API - Datacenters](https://www.linode.com/api/utility/avail.datacenters)
 
+### provider.kernel
+
+The kernel can be specified using the *kernelid* provider parameter, or with *kernel* which
+will use a partial text match.
+
+```
+curl -X POST "https://api.linode.com/?api_action=avail.kernels" \
+     --data-ascii api_key="$LINODE_API_KEY" \
+     2>/dev/null | jq '.DATA [] | .KERNELID,.LABEL'
+```
+
+More detail: [Linode API - Kernels](https://www.linode.com/api/utility/avail.kernels)
+
+
 Run
 ---
 After creating your project's `Vagrantfile` with the required configuration
@@ -193,6 +205,12 @@ The provider supports the following Vagrant sub-commands:
 - `vagrant status` - Outputs the status (active, off, not created) for the
   linode instance.
 
+
+More Docs and Tools
+-------------------
+[Linode Guides and Tutorials - Using Vagrant to Manage Linode Environments](https://linode.com/docs/applications/configuration-management/vagrant-linode-environments)
+[Puphpet - Online Vagrantfile Generator](https://puphpet.com/#vagrantfile-linode)
+
 Contribute
 ----------
 To contribute, clone the repository, and use [Bundler](http://gembundler.com)

data/lib/vagrant-linode/actions/create.rb

@@ -38,6 +38,15 @@ module VagrantPlugins
             distribution_id = @machine.provider_config.distributionid
           end
 
+          if @machine.provider_config.kernel
+            kernels = @client.avail.kernels
+            kernel = kernels.find { |k| k.label.downcase.include? @machine.provider_config.kernel.downcase }
+            raise( Errors::KernelMatch, kernel: @machine.provider_config.kernel.to_s ) if kernel == nil
+            kernel_id = kernel.kernelid || nil
+          else
+            kernel_id = @machine.provider_config.kernelid
+          end
+
           if @machine.provider_config.datacenter
             datacenters = @client.avail.datacenters
             datacenter = datacenters.find { |d| d.abbr == @machine.provider_config.datacenter }
@@ -118,9 +127,6 @@ module VagrantPlugins
             )
           end
 
-	  # kernel id
-	  kernel_id = @machine.provider_config.kernel_id
-
           config = @client.linode.config.create(
             linodeid: result['linodeid'],
             label: 'Vagrant Config',

data/lib/vagrant-linode/config.rb

@@ -14,6 +14,7 @@ module VagrantPlugins
       attr_accessor :xvda_size
       attr_accessor :swap_size
       attr_accessor :kernel_id
+      attr_accessor :kernel
       attr_accessor :label
       attr_accessor :group
 
@@ -33,6 +34,7 @@ module VagrantPlugins
         @xvda_size          = UNSET_VALUE
         @swap_size          = UNSET_VALUE
         @kernel_id          = UNSET_VALUE
+        @kernel             = UNSET_VALUE
         @label              = UNSET_VALUE
         @group              = UNSET_VALUE
       end
@@ -50,7 +52,7 @@ module VagrantPlugins
         @setup              = true if @setup == UNSET_VALUE
         @xvda_size          = true if @xvda_size == UNSET_VALUE
         @swap_size          = '256' if @swap_size == UNSET_VALUE
-        @kernel_id          = '138' if @kernel_id == UNSET_VALUE
+        @kernel             = 'Latest 64 bit' if @kernel == UNSET_VALUE and @kernel_id == UNSET_VALUE
         @label              = false if @label == UNSET_VALUE
         @group              = false if @group == UNSET_VALUE
       end

data/lib/vagrant-linode/errors.rb

@@ -16,6 +16,10 @@ module VagrantPlugins
       class DistroMatch < LinodeError
         error_key(:distro_match)
       end
+ 
+      class KernelMatch < LinodeError
+        error_key(:kernel_match)
+      end
 
       class JSONError < LinodeError
         error_key(:json)

data/lib/vagrant-linode/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Linode
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/locales/en.yml

@@ -89,6 +89,9 @@ en:
       distro_match: !-
         The provider does not support your configurations chosen Distribution %{distro}.
         Supported distributions can be found at the following url - https://www.linode.com/distributions
+      kernel_match: !-
+        The provider does not support your configurations chosen Kernel %{kernel}.
+        Supported kernels can be found at the following url - https://www.linode.com/kernels
       disk_size: !-
         The space which you have specified for your Disk Images is too large for your
         plans allocations. Current = %{current}MB, Max = %{max}

data/test/Vagrantfile

@@ -34,7 +34,8 @@ Vagrant.configure('2') do |config|
 
     # Kernel Image ID
     # [str] 138 if nil
-    provider.kernel_id = '138'
+    # provider.kernel_id = '138'
+    provider.kernel = 'Latest 64 bit'
 
     # Networking (Optional Configuration)
 

data/vagrant-linode.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://www.github.com/displague/vagrant-linode'
   gem.summary       = gem.description
 
-  gem.add_runtime_dependency 'linodeapi'
-  gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'log4r'
+  gem.add_runtime_dependency 'linodeapi', '~> 0.1.1'
+  gem.add_runtime_dependency 'json', '~> 1.8.3'
+  gem.add_runtime_dependency 'log4r', '~> 1.1.10'
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.14.0"
-  gem.add_development_dependency "aruba", "~> 0.5.4"
+  gem.add_development_dependency 'rake', '~> 10.4.2'
+  gem.add_development_dependency 'rspec', '~> 2.14.0'
+  gem.add_development_dependency 'aruba', '~> 0.5.4'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linodeapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement