vagrant-linode 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f6930e7ece744f93f6eedaedab23c5fcb5fba2
-  data.tar.gz: 8420b21d58fed7ce446a029f1bbc8e53111a42e0
+  metadata.gz: d69d729a4e0d62d3e6a9e7b0b21ecdb80995b37b
+  data.tar.gz: d607202c4ff6ef28c01612ca7888cf20ad91cc46
 SHA512:
-  metadata.gz: de302d8cd12bc85e080f944898d80811b5201d24346177dd274251fc5b427563fb19103739419a1878d4973eca2e88e30bd01a079534d98ef9238b8fb51d4bec
-  data.tar.gz: b8bed5e966d2a134b304697b12895d4c0d7eb0abce2ff46a45e64641087083b7119c4fca8789d31498d517c0fe4fbfbfb386af4d7df05a1e970425fd6a08ba19
+  metadata.gz: dc76f6878e29e12e0ed2608b07bae18938bdfb843be758a70439f08b1903bea6fd2b456c54a5acbebd8580798cf66d1d5108d124df0dc235c60d5d9b91ed2a3e
+  data.tar.gz: eaeb9a36d82212a329d25338fdd70af8b972d97641ff431adb8ae78d18ad9c206016dc0df06c601af40d4f346c6be05be66fa32a7a027e84127e1781bac2f3a2

data/README.md

@@ -171,6 +171,11 @@ curl -X POST "https://api.linode.com/?api_action=avail.kernels" \
 
 More detail: [Linode API - Kernels](https://www.linode.com/api/utility/avail.kernels)
 
+### nfs.functional
+
+The sync provider, NFS, has been disabled to make rsync easier to use.  To enable NFS, 
+run Vagrant with an environment variable `LINODE_NFS_FUNCTIONAL=1`.  This will require
+a bit more configuration between the Linode and the Vagrant host.
 
 Run
 ---

data/box/README.md

@@ -11,3 +11,9 @@ $ tar cvzf linode.box ./metadata.json ./Vagrantfile
 This box works by using Vagrant's built-in Vagrantfile merging to setup
 defaults for Linode. These defaults can easily be overwritten by higher-level
 Vagrantfiles (such as project root Vagrantfiles).
+
+# Test
+
+```
+vagrant box add --name linode_test linode.box
+```

data/box/metadata.json

@@ -1,3 +1,3 @@
 {
-  provider: 'linode'
+  "provider": "linode"
 }

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

@@ -16,7 +16,7 @@ module VagrantPlugins
         end
 
         def call(env)
-	  @client = env[:linode_api]
+          @client = env[:linode_api]
           ssh_key_id = env[:machine].config.ssh.private_key_path
           ssh_key_id = ssh_key_id[0] if ssh_key_id.is_a?(Array)
           if ssh_key_id
@@ -29,6 +29,23 @@ module VagrantPlugins
             root_pass = Digest::SHA2.new.update(@machine.provider_config.api_key).to_s
           end
 
+          if @machine.provider_config.stackscript
+            stackscripts = @client.stackscript.list + @client.avail.stackscripts
+            stackscript = stackscripts.find { |s| s.label.downcase == @machine.provider_config.stackscript.to_s.downcase }
+            fail(Errors::StackscriptMatch, stackscript: @machine.provider_config.stackscript.to_s) if stackscript.nil?
+            stackscript_id = stackscript.stackscriptid || nil
+          else
+            stackscript_id = @machine.provider_config.stackscriptid
+          end
+
+          stackscript_udf_responses = @machine.provider_config.stackscript_udf_responses
+
+          if stackscript_udf_responses and !stackscript_udf_responses.is_a?(Hash)
+            fail(Errors::StackscriptUDFFormat, format: stackscript_udf_responses.class.to_s)
+          else
+            stackscript_udf_responses = @machine.provider_config.stackscript_udf_responses or {}
+          end
+
           if @machine.provider_config.distribution
             distributions = @client.avail.distributions
             distribution = distributions.find { |d| d.label.downcase.include? @machine.provider_config.distribution.downcase }
@@ -50,7 +67,7 @@ module VagrantPlugins
             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
+          end
 
           if @machine.provider_config.kernel
             kernels = @client.avail.kernels
@@ -114,7 +131,26 @@ module VagrantPlugins
           # assign the machine id for reference in other commands
           @machine.id = result['linodeid'].to_s
 
-          if distribution_id
+          if stackscript_id
+            swap = @client.linode.disk.create(
+              linodeid: result['linodeid'],
+              label: 'Vagrant swap',
+              type: 'swap',
+              size: swap_size
+            )
+
+            disk = @client.linode.disk.createfromstackscript(
+              linodeid: result['linodeid'],
+              stackscriptid: stackscript_id,
+              stackscriptudfresponses: JSON.dump(stackscript_udf_responses),
+              distributionid: distribution_id,
+              label: 'Vagrant Disk Distribution ' + distribution_id.to_s + ' Linode ' + result['linodeid'].to_s,
+              type: 'ext4',
+              size: xvda_size,
+              rootsshkey: pubkey,
+              rootpass: root_pass
+            )
+          elsif distribution_id
             swap = @client.linode.disk.create(
               linodeid: result['linodeid'],
               label: 'Vagrant swap',

data/lib/vagrant-linode/config.rb

@@ -17,6 +17,9 @@ module VagrantPlugins
       attr_accessor :ca_path
       attr_accessor :ssh_key_name
       attr_accessor :setup
+      attr_accessor :stackscriptid
+      attr_accessor :stackscript
+      attr_accessor :stackscript_udf_responses
       attr_accessor :xvda_size
       attr_accessor :swap_size
       attr_accessor :kernelid
@@ -34,9 +37,12 @@ module VagrantPlugins
         @api_url            = UNSET_VALUE
         @distributionid     = UNSET_VALUE
         @distribution       = UNSET_VALUE
+        @stackscriptid      = UNSET_VALUE
+        @stackscript        = UNSET_VALUE
+        @stackscript_udf_responses = UNSET_VALUE
         @imageid            = UNSET_VALUE
-	@image              = UNSET_VALUE
-	@datacenterid       = UNSET_VALUE
+        @image              = UNSET_VALUE
+        @datacenterid       = UNSET_VALUE
         @datacenter         = UNSET_VALUE
         @planid             = UNSET_VALUE
         @plan               = UNSET_VALUE
@@ -61,13 +67,16 @@ module VagrantPlugins
         @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       = nil if @distribution == UNSET_VALUE
         @distribution       = 'Ubuntu 14.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
         @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               = 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
@@ -97,29 +106,39 @@ 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 @distributionid and @distribution
+          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')
-	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 @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 @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
+        if (@distribution or @distributionid) and (@imageid or @image)
+          errors << I18n.t('vagrant_linode.config.distribution_or_image')
+        end
 
         { 'Linode Provider' => errors }
       end

data/lib/vagrant-linode/errors.rb

@@ -56,6 +56,14 @@ module VagrantPlugins
       class RsyncError < LinodeError
         error_key(:rsync)
       end
+
+      class StackscriptMatch < LinodeError
+        error_key(:stackscript_match)
+      end
+
+      class StackscriptUDFFormat < LinodeError
+        error_key(:stackscript_udf_responses)
+      end
     end
   end
 end

data/lib/vagrant-linode/version.rb

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

data/locales/en.yml

@@ -46,6 +46,7 @@ en:
       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"
+      stackscriptid_or_stackscript: "Use either stackscriptid or stackscript, 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"
@@ -126,3 +127,8 @@ en:
       plan_id: !-
         The plan which you have specified ( %{plan} ) is not available at this time,
         for more information regarding plans review the following url - https://www.linode.com/pricing
+      stackscript_match: !-
+        The provider does not have your chosen Stackscript ( %{stackscript} ).
+        Supported distributions can be found at the following url - https://manager.linode.com/stackscripts
+      stackscript_udf_responses: !-
+        The stackscript UDF responses object provided is of the wrong type. It should be a Hash.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-linode
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linodeapi
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage Linode linodes