vagrant-linode 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e16e4d4758bf63cfd92415d81520f83db8f353c3
-  data.tar.gz: 6bc13afd6403044f06b2b8cb1d1e2be04d5d2e56
+  metadata.gz: 18251b22d7c4b04762d22da9cb2d724604345a71
+  data.tar.gz: a4b9cd21684c90388fb3f81a745bc3a911bb643e
 SHA512:
-  metadata.gz: 4b996b315d58e433ae27434d50b2e8974f15a6fe751ad5f8e6598774673c042ef76aac85b9392e530134d5917a2006e86c76b0a5afe35656c1a5a98217538fd0
-  data.tar.gz: d7a18739c9a870e5f4e5affa6c1b1be7da1b67cc819768d4e82f9546ca4c7c20a2f2679c5f027916fa33a5e22651e7484523f140c3ae6e5da32e9fa7d9955e95
+  metadata.gz: 16753c736f94bbbe79f16f15f6d9274b0dc76f5f86549ecedf96ec847447f2e95b47e6ea3e20a8a7b35c82028ac56fd7b68dfb4fd2655742486e7422c605cb62
+  data.tar.gz: a26d05de5eea17ae1d966590d588ea8116643744900cba9c74be9d8b29e44989b9bea1414a5be10a7d2063441ed6c10369aab9ef06e81822a168f5b4d55c4d17

data/CHANGELOG.md

@@ -1,4 +1,4 @@
 Changelog
 =========
 
-
+v0.2.2 fixed provision on startup

data/README.md

@@ -29,7 +29,7 @@ Configure
 ---------
 Once the provider has been installed, you will need to configure your project
 to use it. The most basic `Vagrantfile` to create a linode on Linode
-is shown below:
+is shown below (with most of the available options included but commented out):
 
 ```ruby
 Vagrant.configure('2') do |config|
@@ -51,8 +51,8 @@ Vagrant.configure('2') do |config|
     # provider.kernel = <string>
     # provider.kernelid = <int>
     # provider.private_networking = <boolean>
-    # provider.stackscript = <string>
-    # provider.stackscriptid = <int>
+    # provider.stackscript = <string> # Not Supported Yet
+    # provider.stackscriptid = <int> # Not Supported Yet
     # provider.distributionid = <int>
   end
 end
@@ -113,17 +113,17 @@ Current Plan-ID table follows:
 
 This can be obtained through vagrant with:
 ```
-vagrant linode datacenters
+vagrant linode plans
 ```
 
 Or using curl:
 ```
-curl -X POST "https://api.linode.com/?api_action=avail.plans" \
+curl -X POST "https://api.linode.com/?api_action=avail.linodeplans" \
      --data-ascii api_key="$LINODE_API_KEY" \
      2>/dev/null | jq '.DATA [] | .PLANID,.LABEL'
 ```
 
-More detail: [Linode API - Plans](https://www.linode.com/api/utility/avail.plans)
+More detail: [Linode API - Plans](https://www.linode.com/api/utility/avail.linodeplans)
 
 ### provider.datacenter
 
@@ -139,6 +139,7 @@ Current Region-ID table is:
 |   6          | newark     | Newark, NJ, USA     |
 |   8          | tokyo      | Tokyo, JP           |
 |   9          | singapore  | Singapore, SGP      |
+|   10         | frankfurt  | Frankfurt, DE       |
 
 You can find latest datacenter ID number using Vagrant subcommands:
 

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

@@ -38,6 +38,20 @@ module VagrantPlugins
             distribution_id = @machine.provider_config.distributionid
           end
 
+          if @machine.provider_config.imageid
+            distribution_id = nil
+            images = @client.image.list
+            image = images.find { |i| i.imageid == @machine.provider_config.imageid }
+            fail Errors::ImageMatch, image: @machine.provider_config.imageid.to_s  if image.nil?
+            image_id = image.imageid || nil
+          elsif @machine.provider_config.image
+            distribution_id = nil
+            images = @client.image.list
+            image = images.find { |i| i.label.downcase.include? @machine.provider_config.image.downcase }
+            fail Errors::ImageMatch, image: @machine.provider_config.image.to_s  if image.nil?
+            image_id = image.imageid || nil
+	  end
+
           if @machine.provider_config.kernel
             kernels = @client.avail.kernels
             kernel = kernels.find { |k| k.label.downcase.include? @machine.provider_config.kernel.downcase }
@@ -50,17 +64,24 @@ module VagrantPlugins
           if @machine.provider_config.datacenter
             datacenters = @client.avail.datacenters
             datacenter = datacenters.find { |d| d.abbr == @machine.provider_config.datacenter }
-            datacenter_id = datacenter.datacenterid || nil # @todo throw if not found
+            fail Errors::DatacenterMatch, datacenter: @machine.provider_config.datacenter if datacenter.nil?
+            datacenter_id = datacenter.datacenterid
           else
-            datacenter_id = @machine.provider_config.datacenterid
+            datacenters = @client.avail.datacenters
+            datacenter = datacenters.find { |d| d.datacenterid == @machine.provider_config.datacenterid }
+            fail Errors::DatacenterMatch, datacenter: @machine.provider_config.datacenter if datacenter.nil?
+            datacenter_id = datacenter.datacenterid
           end
 
           if @machine.provider_config.plan
             plans = @client.avail.linodeplans
             plan = plans.find { |p| p.label.include? @machine.provider_config.plan }
             fail Errors::PlanID, plan: @machine.provider_config.plan if plan.nil?
-            plan_id = plan.planid || nil
+            plan_id = plan.planid
           else
+            plans = @client.avail.linodeplans
+            plan = plans.find { |p| p.planid == @machine.provider_config.planid }
+            fail Errors::PlanID, plan: @machine.provider_config.plan if plan.nil?
             plan_id = @machine.provider_config.planid
           end
 
@@ -114,6 +135,7 @@ module VagrantPlugins
             disk = @client.linode.disk.createfromimage(
               linodeid: result['linodeid'],
               imageid: image_id,
+              label: 'Vagrant Disk Image (' + image_id.to_s + ') for ' + result['linodeid'].to_s,
               size: xvda_size,
               rootsshkey: pubkey,
               rootpass: root_pass
@@ -197,7 +219,7 @@ module VagrantPlugins
 
         # generate a random name if server name is empty
         def get_server_name
-          server_name = "vagrant_linode-#{rand.to_s.split('.')[1]}"
+          "vagrant_linode-#{rand.to_s.split('.')[1]}"
         end
 
         def terminate(env)

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

@@ -17,9 +17,8 @@ module VagrantPlugins
         def read_state(_linode, machine)
           return :not_created if machine.id.nil?
           server = Provider.linode(machine)
-
           return :not_created if server.nil?
-	  status = server.status
+          status = server[:status]
           return :not_created if status.nil?
           states = {
             ''  => :not_created,

data/lib/vagrant-linode/actions.rb

@@ -111,22 +111,22 @@ module VagrantPlugins
             if env[:result]
               b.use Call, IsStopped do |env2, b2|
                 if env2[:result]
+                  b2.use Provision
                   b2.use MessageOff
                   b2.use ConnectLinode
                   b2.use PowerOn
-                  b2.use Provision
                 else
                   b2.use MessageAlreadyActive
                 end
               end
             else
+              b.use Provision
               b.use MessageNotCreated
               b.use ConnectLinode
               b.use Create
               b.use SetupSudo
               b.use SetupUser
               b.use SetupHostname
-              b.use Provision
             end
           end
         end

data/lib/vagrant-linode/config.rb

@@ -4,8 +4,13 @@ module VagrantPlugins
       attr_accessor :token # deprecated
       attr_accessor :api_key
       attr_accessor :api_url
+      attr_accessor :distributionid
       attr_accessor :distribution
+      attr_accessor :imageid
+      attr_accessor :image
+      attr_accessor :datacenterid
       attr_accessor :datacenter
+      attr_accessor :planid
       attr_accessor :plan
       attr_accessor :paymentterm
       attr_accessor :private_networking
@@ -14,7 +19,7 @@ module VagrantPlugins
       attr_accessor :setup
       attr_accessor :xvda_size
       attr_accessor :swap_size
-      attr_accessor :kernel_id
+      attr_accessor :kernelid
       attr_accessor :kernel
       attr_accessor :label
       attr_accessor :group
@@ -27,8 +32,13 @@ module VagrantPlugins
         @token              = UNSET_VALUE
         @api_key            = UNSET_VALUE
         @api_url            = UNSET_VALUE
+        @distributionid     = UNSET_VALUE
         @distribution       = UNSET_VALUE
+        @imageid            = UNSET_VALUE
+	@image              = UNSET_VALUE
+	@datacenterid       = UNSET_VALUE
         @datacenter         = UNSET_VALUE
+        @planid             = UNSET_VALUE
         @plan               = UNSET_VALUE
         @paymentterm        = UNSET_VALUE
         @private_networking = UNSET_VALUE
@@ -37,7 +47,7 @@ module VagrantPlugins
         @setup              = UNSET_VALUE
         @xvda_size          = UNSET_VALUE
         @swap_size          = UNSET_VALUE
-        @kernel_id          = UNSET_VALUE
+        @kernelid           = UNSET_VALUE
         @kernel             = UNSET_VALUE
         @label              = UNSET_VALUE
         @group              = UNSET_VALUE
@@ -48,9 +58,17 @@ module VagrantPlugins
         @token              = ENV['LINODE_TOKEN'] if @token == UNSET_VALUE
         @api_key            = @token if ((@api_key == nil) and (@token != nil))
         @api_url            = ENV['LINODE_URL'] if @api_url == UNSET_VALUE
-        @distribution       = 'Ubuntu 14.04 LTS' if @distribution == UNSET_VALUE
-        @datacenter         = 'dallas' if @datacenter == UNSET_VALUE
-        @plan               = 'Linode 1024' if @plan == UNSET_VALUE
+        @imageid            = nil if @imageid == UNSET_VALUE
+        @image              = nil if @image == UNSET_VALUE
+        @distributionid     = nil if @distributionid == UNSET_VALUE
+	@distribution       = nil if @distribution == UNSET_VALUE
+        @distribution       = 'Ubuntu 14.04 LTS' if @distribution.nil? and @distributionid.nil? and @imageid.nil? and @image.nil?
+        @datacenterid       = nil if @datacenterid == UNSET_VALUE
+        @datacenter         = nil if @datacenter == UNSET_VALUE
+        @datacenter         = 'dallas' if @datacenter.nil? and @datacenterid.nil?
+        @planid             = nil if @planid == UNSET_VALUE
+	@plan               = nil if @plan == UNSET_VALUE
+        @plan               = 'Linode 1024' if @plan.nil? and @planid.nil?
         @paymentterm        = '1' if @paymentterm == UNSET_VALUE
         @private_networking = false if @private_networking == UNSET_VALUE
         @ca_path            = nil if @ca_path == UNSET_VALUE
@@ -58,7 +76,9 @@ 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             = 'Latest 64 bit' if @kernel == UNSET_VALUE and @kernel_id == UNSET_VALUE
+        @kernelid           = nil if @kernelid == UNSET_VALUE
+        @kernel             = nil if @kernel == UNSET_VALUE
+        @kernel             = 'Latest 64 bit' if @kernel.nil? and @kernelid.nil?
         @label              = false if @label == UNSET_VALUE
         @group              = false if @group == UNSET_VALUE
       end
@@ -77,6 +97,30 @@ module VagrantPlugins
           errors << I18n.t('vagrant_linode.config.public_key', key: "#{key}.pub")
         end
 
+	if @distributionid and @distribution
+	  errors << I18n.t('vagrant_linode.config.distributionid_or_distribution')
+	end
+
+	if @datacenterid and @datacenter
+	  errors << I18n.t('vagrant_linode.config.datacenterid_or_datacenter')
+	end
+
+	if @kernelid and @kernel
+	  errors << I18n.t('vagrant_linode.config.kernelid_or_kernel')
+	end
+
+	if @planid and @plan
+	  errors << I18n.t('vagrant_linode.config.planid_or_plan')
+	end
+
+	if @imageid and @image
+	  errors << I18n.t('vagrant_linode.config.imageid_or_image')
+	end
+
+	if (@distribution or @distributionid) and (@imageid or @image)
+	  errors << I18n.t('vagrant_linode.config.distribution_or_image')
+	end
+
         { 'Linode Provider' => errors }
       end
     end

data/lib/vagrant-linode/errors.rb

@@ -16,7 +16,15 @@ module VagrantPlugins
       class DistroMatch < LinodeError
         error_key(:distro_match)
       end
+
+      class DatacenterMatch < LinodeError
+        error_key(:datacenter_match)
+      end
  
+      class ImageMatch < LinodeError
+        error_key(:image_match)
+      end
+
       class KernelMatch < LinodeError
         error_key(:kernel_match)
       end

data/lib/vagrant-linode/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Linode
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/locales/en.yml

@@ -44,6 +44,12 @@ en:
       private_key: "SSH private key path is required"
       public_key: "SSH public key not found: %{key}"
       disk_too_large: "Disk Images use more drive space than plan allocates"
+      planid_or_plan: "Use either planid or plan, not both"
+      distributionid_or_distribution: "Use either distributionid or distribution, not both"
+      datacenterid_or_datacenter: "Use either datacenterid or datacenter, not both"
+      kernelid_or_kernel: "Use either kernelid or kernel, not both"
+      imageid_or_image: "Use either imageid or image, not both"
+      distribution_or_image: "Distribution can not be specified with Image options"
     errors:
       public_key: |-
         There was an issue reading the public key at:
@@ -102,11 +108,17 @@ en:
         certs.
       local_ip: |-
         The Linode provider was unable to determine the host's IP.
+      datacenter_match: !-
+        The provider does not support your configurations chosen Datacenter ( %{datacenter} ).
+        Supported datacenters can be found at the following url - https://www.linode.com/api/utility/avail.datacenters
       distro_match: !-
-        The provider does not support your configurations chosen Distribution %{distro}.
+        The provider does not support your configurations chosen Distribution ( %{distro} ).
         Supported distributions can be found at the following url - https://www.linode.com/distributions
+      image_match: !-
+        The provider does not support your configurations chosen Image ( %{image} ).
+        Available images can be found at https://manager.linode.com/images/ or with "vagrant linode image list"
       kernel_match: !-
-        The provider does not support your configurations chosen Kernel %{kernel}.
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linodeapi
@@ -129,7 +129,6 @@ files:
 - lib/vagrant-linode/actions/create.rb
 - lib/vagrant-linode/actions/create_image.rb
 - lib/vagrant-linode/actions/destroy.rb
-- lib/vagrant-linode/actions/halt.rb
 - lib/vagrant-linode/actions/is_created.rb
 - lib/vagrant-linode/actions/is_stopped.rb
 - lib/vagrant-linode/actions/list_datacenters.rb

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

@@ -1,29 +0,0 @@
-require 'vagrant-linode/helpers/client'
-require 'vagrant-linode/helpers/waiter'
-
-module VagrantPlugins
-  module Linode
-    module Actions
-
-      class Reload
-        include Helpers::Waiter
-        def initialize(app, env)
-          @app = app
-          @machine = env[:machine]
-          @logger = Log4r::Logger.new('vagrant::linode::reload')
-        end
-
-        def call(env)
-          @client = env[:linode_api]
-          # submit reboot linode request
-          result = @client.linode.reboot(linodeid: @machine.id)
-
-          # wait for request to complete
-          env[:ui].info I18n.t('vagrant_linode.info.reloading')
-          wait_for_event(env, result['jobid'])
-          @app.call(env)
-        end
-      end
-    end
-  end
-end