vagrant-linode 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69d729a4e0d62d3e6a9e7b0b21ecdb80995b37b
-  data.tar.gz: d607202c4ff6ef28c01612ca7888cf20ad91cc46
+  metadata.gz: 443c9bd53fdfdbac32073c829fff80089a95b950
+  data.tar.gz: acac7d5845129390b7d32c5f5067c117db7fe2f0
 SHA512:
-  metadata.gz: dc76f6878e29e12e0ed2608b07bae18938bdfb843be758a70439f08b1903bea6fd2b456c54a5acbebd8580798cf66d1d5108d124df0dc235c60d5d9b91ed2a3e
-  data.tar.gz: eaeb9a36d82212a329d25338fdd70af8b972d97641ff431adb8ae78d18ad9c206016dc0df06c601af40d4f346c6be05be66fa32a7a027e84127e1781bac2f3a2
+  metadata.gz: 0445248a9412d7313ffe3c222e9603ddc89d4f8e7b49f9e572ced1557230f555f2cd6ff3a00596119972b6110c5aba7c2df42400cc5524f8d6cb73641cfde49b
+  data.tar.gz: 21a2e6612a0710227578152f8f0b98ed6189245bf212fcdb0c74056982aec18661b51735a9fcec85adc1c8ab8b34b84b459218e18c0d45e3b31cebf847693dd7

data/README.md

@@ -40,9 +40,9 @@ Vagrant.configure('2') do |config|
     override.vm.box_url = "https://github.com/displague/vagrant-linode/raw/master/box/linode.box"
 
     provider.api_key = 'API_KEY'
-    provider.distribution = 'Ubuntu 14.04 LTS'
+    provider.distribution = 'Ubuntu 16.04 LTS'
     provider.datacenter = 'newark'
-    provider.plan = 'Linode 1024'
+    provider.plan = 'Linode 2048'
     # provider.planid = <int>
     # provider.paymentterm = <*1*,12,24>
     # provider.datacenterid = <int>
@@ -76,7 +76,7 @@ The following attributes are available to further configure the provider:
 - `provider.datacenter` - A string representing the datacenter to create the new
    linode in. It defaults to `dallas`.
 - `provider.plan` - A string representing the size to use when creating a
-  new linode (e.g. `Linode 2048`). It defaults to `Linode 1024`.
+  new linode (e.g. `Linode 4096`). It defaults to `Linode 2048`.
 - `provider.private_networking` - A boolean flag indicating whether to enable
   a private network interface. It defaults to `false`.
 - `provider.ssh_key_name` - A string representing the name to use when creating
@@ -99,21 +99,21 @@ attribute is `true`.
 Each Linode Tier has been assigned a Plan Identifcation Number.
 Current Plan-ID table follows:
 
-| PlanID  | Plan                      |
-|:------- |:------------------------- |
-|    1    |  1GB Plan (Linode 1024)   |
-|    2    |  2GB Plan (Linode 2048)   |
-|    4    |  4GB Plan (Linode 4096)   |
-|    6    |  8GB Plan (Linode 8192)   |
-|    7    | 16GB Plan (Linode 16384)  |
-|    8    | 32GB Plan (Linode 32768)  |
-|    9    | 48GB Plan (Linode 49152)  |
-|   10    | 64GB Plan (Linode 65536)  |
-|   12    | 96GB Plan (Linode 98304)  |
+| PlanID  | Plan                        |
+|:------- |:--------------------------- |
+|    1    |   2GB Plan (Linode 2048)    |
+|    2    |   4GB Plan (Linode 4096)    |
+|    4    |   8GB Plan (Linode 8192)    |
+|    6    |  12GB Plan (Linode 12288)   |
+|    7    |  24GB Plan (Linode 24576)   |
+|    8    |  48GB Plan (Linode 49152)   |
+|    9    |  64GB Plan (Linode 65536)   |
+|   10    |  80GB Plan (Linode 81920)   |
+|   12    | 120GB Plan (Linode 122880)  |
 
 This can be obtained through vagrant with:
 ```
-vagrant linode plans
+vagrant linode plans <machine_name>
 ```
 
 Or using curl:

data/features/provision.feature

@@ -20,7 +20,7 @@ Feature: vagrant-linode fog tests
         provider.server_name = 'vagrant-provisioned-server'
         provider.api_key  = ENV['LINODE_API_KEY']
         provider.datacenter   = 'dallas'
-        provider.plan   = /Linode 1024/
+        provider.plan   = /Linode 2048/
         provider.distribution    = /Ubuntu/
         provider.public_key_path = "~/.ssh/id_rsa.pub"
       end

data/features/vagrant-linode.feature

@@ -27,7 +27,7 @@ Feature: vagrant-linode fog tests
         provider.server_name = 'vagrant-single-server'
         provider.api_key  = ENV['LINODE_API_KEY']
         linode.datacenter = ENV['LINODE_DATACENTER'].downcase.to_sym
-        linode.plan   = /Linode 1024/
+        linode.plan   = /Linode 2048/
         linode.distribution    = /Ubuntu/
         linode.public_key_path = "~/.ssh/id_rsa.pub" unless Fog.mock?
       end
@@ -56,7 +56,7 @@ Scenario: Create a single server (linode_compute_url)
         provider.server_name = 'vagrant-single-server'
         provider.api_key  = ENV['LINODE_API_KEY']
         provider.api_url = "https://api.linode.com/"
-        provider.plan   = /Linode 1024/
+        provider.plan   = /Linode 2048/
         provider.distribution    = /Ubuntu/
         provider.public_key_path = "~/.ssh/id_rsa.pub" unless Fog.mock?
       end

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

@@ -97,8 +97,8 @@ module VagrantPlugins
             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 = plans.find { |p| p.planid.to_i == @machine.provider_config.planid.to_i }
+            fail Errors::PlanID, plan: @machine.provider_config.planid if plan.nil?
             plan_id = @machine.provider_config.planid
           end
 
@@ -125,7 +125,7 @@ module VagrantPlugins
             datacenterid: datacenter_id,
             paymentterm: @machine.provider_config.paymentterm || 1
           )
-          env[:ui].info I18n.t('vagrant_linode.info.created', linodeid: result['linodeid'])
+          env[:ui].info I18n.t('vagrant_linode.info.created', linodeid: result['linodeid'], label: (@machine.provider_config.label or "linode#{result['linodeid']}"))
 
           # @client.linode.job.list(:linodeid => result['linodeid'], :pendingonly => 1)
           # assign the machine id for reference in other commands

data/lib/vagrant-linode/config.rb

@@ -68,7 +68,7 @@ module VagrantPlugins
         @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?
+        @distribution       = 'Ubuntu 16.04 LTS' if @distribution.nil? and @distributionid.nil? and @imageid.nil? and @image.nil?
         @stackscriptid      = nil if @stackscriptid == UNSET_VALUE
         @stackscript        = nil if @stackscript == UNSET_VALUE
         @stackscript_udf_responses = nil if @stackscript_udf_responses == UNSET_VALUE
@@ -77,7 +77,7 @@ module VagrantPlugins
         @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?
+        @planid             = '1' 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
@@ -110,19 +110,13 @@ module VagrantPlugins
           errors << I18n.t('vagrant_linode.config.distributionid_or_distribution')
         end
 
-<<<<<<< 879127420e478cc36b502abe9dd6d88b7d3ccc40
         if @stackscriptid and @stackscript
           errors << I18n.t('vagrant_linode.config.stackscriptid_or_stackscript')
         end
 
-	if @datacenterid and @datacenter
-	  errors << I18n.t('vagrant_linode.config.datacenterid_or_datacenter')
-	end
-=======
         if @datacenterid and @datacenter
           errors << I18n.t('vagrant_linode.config.datacenterid_or_datacenter')
         end
->>>>>>> nagging white-space clean-up in config.rb
 
         if @kernelid and @kernel
           errors << I18n.t('vagrant_linode.config.kernelid_or_kernel')

data/lib/vagrant-linode/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Linode
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
   end
 end

data/locales/en.yml

@@ -6,7 +6,7 @@ en:
       already_active: "Linode is already active"
       already_off: "Linode is already off"
       creating: "Creating a new linode..."
-      created: "Created a new linode... %{linodeid}"
+      created: "Created a new linode... %{linodeid}, https://manager.linode.com/linodes/dashboard/%{label}"
       booting: "Booting Linode %{linodeid} ..."
       linode_ip: "Assigned IP address: %{ip}"
       linode_private_ip: "Private IP address: %{ip}"

data/spec/vagrant-linode/config_spec.rb

@@ -13,7 +13,7 @@ describe VagrantPlugins::Linode::Config do
     its(:api_url)  { should be_nil }
     its(:distribution) { should eq(/Ubuntu/) }
     its(:datacenter) { should eq(/dallas/) }
-    its(:plan) { should eq(/1024/) }
+    its(:plan) { should eq(/2048/) }
     its(:paymentterm)   { should eq(/1/) }
     its(:private_networking)    { should eq(/Ubuntu/) }
     its(:ca_path) { should eql(vagrant_public_key) }

data/test/Vagrantfile

@@ -14,7 +14,7 @@ Vagrant.configure('2') do |config|
     provider.ssh_key_name = 'Test Key'
     provider.distribution = 'Debian 8'
     provider.datacenter = 'newark'
-    provider.plan = '1024'
+    provider.plan = '2048'
     provider.label = 'vagrant-'+Time.new.strftime("%F%T").gsub(/[^0-9]/,'')
 
     # Disk Image Sizes (Optional configuration)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linodeapi