vagrant-linode 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 443c9bd53fdfdbac32073c829fff80089a95b950
-  data.tar.gz: acac7d5845129390b7d32c5f5067c117db7fe2f0
+  metadata.gz: 1de708c156168a1a26ee28dc0cecb4ddefa48b60
+  data.tar.gz: f8ca694da438328963e17d14c1364b10a9f6af82
 SHA512:
-  metadata.gz: 0445248a9412d7313ffe3c222e9603ddc89d4f8e7b49f9e572ced1557230f555f2cd6ff3a00596119972b6110c5aba7c2df42400cc5524f8d6cb73641cfde49b
-  data.tar.gz: 21a2e6612a0710227578152f8f0b98ed6189245bf212fcdb0c74056982aec18661b51735a9fcec85adc1c8ab8b34b84b459218e18c0d45e3b31cebf847693dd7
+  metadata.gz: 3920d13fbb57a4b1440c1f4dc3d1d82890c273f185a0a3ea81a90b4fd799fd5904bb72b977b3480f3b2d5d01f05d73dce85f3744f2a992c481486b611734a515
+  data.tar.gz: 21149e2f5dffd5cc7e3c1439a074b937e50d961197eb3877163572839cc2a7ff9ae965fb298f121ee5e40399e86b154b06493b502a9829a741b93ed20f1d1416

data/.rspec

@@ -1,4 +1,7 @@
 --format
-d
---colour
+doc
+--order
+random
+--color
+--fail-fast
 --backtrace

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 Changelog
 =========
+v0.2.8 fixes for vagrant 1.9
+v0.2.7 fixes for new Linode plans
+v0.2.6 adds stackscript support
 v0.2.5 destroy works when linode is already deleted
 v0.2.4 fixed the box image
 v0.2.3 fixed rsync before provision on startup

data/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-group :plugins do
-  gemspec
-end
+gemspec
 
 group :development do
   # We depend on Vagrant for development, but we don't add it as a
@@ -12,3 +10,7 @@ group :development do
   gem 'coveralls', require: false
   gem 'pry'
 end
+
+group :plugins do
+  gem 'vagrant-linode', path: '.'
+end

data/README.md

@@ -36,8 +36,7 @@ Vagrant.configure('2') do |config|
 
   config.vm.provider :linode do |provider, override|
     override.ssh.private_key_path = '~/.ssh/id_rsa'
-    override.vm.box = 'linode'
-    override.vm.box_url = "https://github.com/displague/vagrant-linode/raw/master/box/linode.box"
+    override.vm.box = 'linode/ubuntu1404'
 
     provider.api_key = 'API_KEY'
     provider.distribution = 'Ubuntu 16.04 LTS'

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

@@ -103,18 +103,15 @@ module VagrantPlugins
           end
 
           ### Disk Images
-          xvda_size, swap_size, disk_sanity = @machine.provider_config.xvda_size, @machine.provider_config.swap_size, true
+          disk_size = plan['disk'].to_i * 1024
+          xvda_size, swap_size, xvdc_size = @machine.provider_config.xvda_size, @machine.provider_config.swap_size, @machine.provider_config.xvdc_size
 
-          # Sanity checks for disk size
-          if xvda_size != true
-            disk_sanity = false if ( xvda_size.to_i + swap_size.to_i) > ( plan['disk'].to_i * 1024)
-          end
+          swap_size = swap_size.to_i
+          xvda_size = xvda_size == true ? disk_size - swap_size : xvda_size.to_i
+          xvdc_size = (xvdc_size.is_a?(Vagrant::Config::V2::DummyConfig) or xvdc_size == true) ? (disk_size - swap_size - xvda_size).abs : xvdc_size.to_i
 
-          # throw if disk sizes are too large
-          if xvda_size == true
-            xvda_size = ( ( plan['disk'].to_i * 1024) - swap_size.to_i)
-          elsif disk_sanity == false
-            fail Errors::DiskSize, current: (xvda_size.to_i + swap_size.to_i), max: ( plan['disk'].to_i * 1024)
+          if ( xvda_size + swap_size + xvdc_size) > disk_size
+            fail Errors::DiskSize, current: (xvda_size + swap_size + xvdc_size), max: disk_size
           end
 
           env[:ui].info I18n.t('vagrant_linode.info.creating')
@@ -131,14 +128,9 @@ module VagrantPlugins
           # assign the machine id for reference in other commands
           @machine.id = result['linodeid'].to_s
 
-          if stackscript_id
-            swap = @client.linode.disk.create(
-              linodeid: result['linodeid'],
-              label: 'Vagrant swap',
-              type: 'swap',
-              size: swap_size
-            )
+          disklist = []
 
+          if stackscript_id
             disk = @client.linode.disk.createfromstackscript(
               linodeid: result['linodeid'],
               stackscriptid: stackscript_id,
@@ -150,14 +142,8 @@ module VagrantPlugins
               rootsshkey: pubkey,
               rootpass: root_pass
             )
+            disklist.push(disk['diskid'])
           elsif distribution_id
-            swap = @client.linode.disk.create(
-              linodeid: result['linodeid'],
-              label: 'Vagrant swap',
-              type: 'swap',
-              size: swap_size
-            )
-
             disk = @client.linode.disk.createfromdistribution(
               linodeid: result['linodeid'],
               distributionid: distribution_id,
@@ -167,6 +153,7 @@ module VagrantPlugins
               rootsshkey: pubkey,
               rootpass: root_pass
             )
+            disklist.push(disk['diskid'])
           elsif image_id
             disk = @client.linode.disk.createfromimage(
               linodeid: result['linodeid'],
@@ -176,19 +163,40 @@ module VagrantPlugins
               rootsshkey: pubkey,
               rootpass: root_pass
             )
+            disklist.push(disk['diskid'])
+          else
+            disklist.push('')
+          end
 
+          if swap_size > 0
             swap = @client.linode.disk.create(
               linodeid: result['linodeid'],
               label: 'Vagrant swap',
               type: 'swap',
               size: swap_size
             )
+            disklist.push(swap['diskid'])
+          else
+            disklist.push('')
+          end
+
+          if xvdc_size > 0
+            xvdc_type = @machine.provider_config.xvdc_type.is_a?(Vagrant::Config::V2::DummyConfig) ? "raw" : @machine.provider_config.xvdc_type
+            xvdc = @client.linode.disk.create(
+              linodeid: result['linodeid'],
+              label: 'Vagrant Leftover Disk Linode ' + result['linodeid'].to_s,
+              type: xvdc_type,
+              size: xvdc_size,
+            )
+            disklist.push(xvdc['diskid'])
+          else
+            disklist.push('')
           end
 
           config = @client.linode.config.create(
             linodeid: result['linodeid'],
             label: 'Vagrant Config',
-            disklist: "#{disk['diskid']},#{swap['diskid']}",
+            disklist: disklist.join(','),
             kernelid: kernel_id
           )
 

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

@@ -1,12 +1,13 @@
 require 'vagrant-linode/helpers/client'
 require 'vagrant-linode/helpers/waiter'
+require 'vagrant-linode/errors'
 
 module VagrantPlugins
   module Linode
     module Actions
       class Rebuild
         include Vagrant::Util::Retryable
-        include Helpers::Waiter
+        include VagrantPlugins::Linode::Helpers::Waiter
 
         def initialize(app, env)
           @app = app
@@ -16,30 +17,250 @@ module VagrantPlugins
 
         def call(env)
           @client = env[:linode_api]
-          # @todo find a convenient way to send provider_config back to the create action, reusing the diskid or configid
-          fail 'not implemented'
-          # look up image id
-          image_id = @client
-            .request('/v2/images')
-            .find_id(:images, name: @machine.provider_config.image)
+          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
+            pubkey = File.read(File.expand_path("#{ssh_key_id}.pub"))
+          end
+
+          if @machine.provider_config.root_pass
+            root_pass = @machine.provider_config.root_pass
+          else
+            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 }
+            fail(Errors::DistroMatch, distro: @machine.provider_config.distribution.to_s) if distribution.nil?
+            distribution_id = distribution.distributionid || nil
+          else
+            distribution_id = @machine.provider_config.distributionid
+          end
 
-          # submit rebuild request
-          result = @client.post("/v2/linodes/#{@machine.id}/actions", type: 'rebuild',
-                                                                      image: image_id)
+          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 }
+            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 }
+            fail Errors::DatacenterMatch, datacenter: @machine.provider_config.datacenter if datacenter.nil?
+            datacenter_id = datacenter.datacenterid
+          else
+            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
 
-          # wait for request to complete
-          env[:ui].info I18n.t('vagrant_linode.info.rebuilding')
-          wait_for_event(env, result['jobid'])
+          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
+          else
+            plans = @client.avail.linodeplans
+            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
+          
+          ### Disk Images
+          xvda_size, swap_size, disk_sanity = @machine.provider_config.xvda_size, @machine.provider_config.swap_size, true
 
-          # refresh linode state with provider
-          Provider.linode(@machine, refresh: true)
+          # Sanity checks for disk size
+          if xvda_size != true
+            disk_sanity = false if ( xvda_size.to_i + swap_size.to_i) > ( plan['disk'].to_i * 1024)
+          end
+
+          # throw if disk sizes are too large
+          if xvda_size == true
+            xvda_size = ( ( plan['disk'].to_i * 1024) - swap_size.to_i)
+          elsif disk_sanity == false
+            fail Errors::DiskSize, current: (xvda_size.to_i + swap_size.to_i), max: ( plan['disk'].to_i * 1024)
+          end
+          
+          env[:ui].info I18n.t('vagrant_linode.info.destroying')
+          
+          diskList = @client.linode.disk.list(
+            linodeid: @machine.id
+          )
+          
+          diskList.each do |diskEntry|
+            diskDeleteResult = @client.linode.disk.delete(
+              linodeid: @machine.id,
+              diskid: diskEntry['diskid']
+            )
+            
+            job = diskDeleteResult['jobid']
+            
+            jobStatus = @client.linode.job.list(
+              linodeid: @machine.id,
+              jobid: job
+            )
+            
+            while jobStatus[0]['host_finish_dt'].nil? || jobStatus[0]['host_finish_dt'].empty? do 
+              sleep(5)
+              jobStatus = @client.linode.job.list(
+                linodeid: @machine.id,
+                jobid: job
+              )
+            end
+          end
+          
+          configList = @client.linode.config.list(
+            linodeid: @machine.id
+          )
+          
+          configList.each do |configEntry|
+            configDeleteResult = @client.linode.config.delete(
+              linodeid: @machine.id,
+              configid: configEntry['configid']
+            )
+          end
+          
+          env[:ui].info I18n.t('vagrant_linode.info.creating')
+
+          if stackscript_id
+            swap = @client.linode.disk.create(
+              linodeid: @machine.id,
+              label: 'Vagrant swap',
+              type: 'swap',
+              size: swap_size
+            )
+
+            disk = @client.linode.disk.createfromstackscript(
+              linodeid: @machine.id,
+              stackscriptid: stackscript_id,
+              stackscriptudfresponses: JSON.dump(stackscript_udf_responses),
+              distributionid: distribution_id,
+              label: 'Vagrant Disk Distribution ' + distribution_id.to_s + ' Linode ' + @machine.id.to_s,
+              type: 'ext4',
+              size: xvda_size,
+              rootsshkey: pubkey,
+              rootpass: root_pass
+            )
+          elsif distribution_id
+            swap = @client.linode.disk.create(
+              linodeid: @machine.id,
+              label: 'Vagrant swap',
+              type: 'swap',
+              size: swap_size
+            )
+
+            disk = @client.linode.disk.createfromdistribution(
+              linodeid: @machine.id,
+              distributionid: distribution_id,
+              label: 'Vagrant Disk Distribution ' + distribution_id.to_s + ' Linode ' + @machine.id.to_s,
+              type: 'ext4',
+              size: xvda_size,
+              rootsshkey: pubkey,
+              rootpass: root_pass
+            )
+          elsif image_id
+            disk = @client.linode.disk.createfromimage(
+              linodeid: @machine.id,
+              imageid: image_id,
+              label: 'Vagrant Disk Image (' + image_id.to_s + ') for ' + @machine.id.to_s,
+              size: xvda_size,
+              rootsshkey: pubkey,
+              rootpass: root_pass
+            )
+
+            swap = @client.linode.disk.create(
+              linodeid: @machine.id,
+              label: 'Vagrant swap',
+              type: 'swap',
+              size: swap_size
+            )
+          end
+
+          config = @client.linode.config.create(
+            linodeid: @machine.id,
+            label: 'Vagrant Config',
+            disklist: "#{disk['diskid']},#{swap['diskid']}",
+            kernelid: kernel_id
+          )
+
+          # @todo: allow provisioning to set static configuration for networking
+          if @machine.provider_config.private_networking
+            private_network = @client.linode.ip.addprivate linodeid: @machine.id
+          end
+
+          label = @machine.provider_config.label
+          label = label || @machine.name if @machine.name != 'default'
+          label = label || get_server_name
+
+          group = @machine.provider_config.group
+          group = "" if @machine.provider_config.group == false
+
+          result = @client.linode.update(
+            linodeid: @machine.id,
+            label: label,
+            lpm_displaygroup: group
+          )
+
+          env[:ui].info I18n.t('vagrant_linode.info.booting', linodeid: @machine.id)
+
+          bootjob = @client.linode.boot linodeid: @machine.id
+          # sleep 1 until ! @client.linode.job.list(:linodeid => @machine.id, :jobid => bootjob['jobid'], :pendingonly => 1).length
+          wait_for_event(env, bootjob['jobid'])
+
+          # refresh linode state with provider and output ip address
+          linode = Provider.linode(@machine, refresh: true)
+          public_network = linode.network.find { |network| network['ispublic'] == 1 }
+          env[:ui].info I18n.t('vagrant_linode.info.linode_ip', ip: public_network['ipaddress'])
+
+          if private_network
+            env[:ui].info I18n.t('vagrant_linode.info.linode_private_ip', ip: private_network['ipaddress'])
+          end
 
           # wait for ssh to be ready
           switch_user = @machine.provider_config.setup?
           user = @machine.config.ssh.username
-          @machine.config.ssh.username = 'root' if switch_user
+          if switch_user
+            @machine.config.ssh.username = 'root'
+            @machine.config.ssh.password = root_pass
+          end
 
-          retryable(tries: 120, sleep: 10) do
+          retryable(tries: 25, sleep: 10) do # @todo bump tries when this is solid
             next if env[:interrupted]
             fail 'not ready' unless @machine.communicate.ready?
           end
@@ -48,6 +269,10 @@ module VagrantPlugins
 
           @app.call(env)
         end
+        
+        def get_server_name
+          "vagrant_linode-#{rand.to_s.split('.')[1]}"
+        end
       end
     end
   end

data/lib/vagrant-linode/config.rb

@@ -21,6 +21,8 @@ module VagrantPlugins
       attr_accessor :stackscript
       attr_accessor :stackscript_udf_responses
       attr_accessor :xvda_size
+      attr_accessor :xvdc_size
+      attr_accessor :xvdc_type
       attr_accessor :swap_size
       attr_accessor :kernelid
       attr_accessor :kernel
@@ -52,6 +54,8 @@ module VagrantPlugins
         @ssh_key_name       = UNSET_VALUE
         @setup              = UNSET_VALUE
         @xvda_size          = UNSET_VALUE
+        @xvdc_size          = UNSET_VALUE
+        @xvdc_type          = UNSET_VALUE
         @swap_size          = UNSET_VALUE
         @kernelid           = UNSET_VALUE
         @kernel             = UNSET_VALUE
@@ -84,6 +88,8 @@ module VagrantPlugins
         @ssh_key_name       = 'Vagrant' if @ssh_key_name == UNSET_VALUE
         @setup              = true if @setup == UNSET_VALUE
         @xvda_size          = true if @xvda_size == UNSET_VALUE
+        @xvdc_size          = nil if @xvdc_size == UNSET_VALUE
+        @xvdc_type          = 'raw' if @xvdc_type == UNSET_VALUE
         @swap_size          = '256' if @swap_size == UNSET_VALUE
         @kernelid           = nil if @kernelid == UNSET_VALUE
         @kernel             = nil if @kernel == UNSET_VALUE

data/lib/vagrant-linode/version.rb

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

data/vagrant-linode.gemspec

@@ -13,13 +13,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://www.github.com/displague/vagrant-linode'
   gem.summary       = gem.description
 
-  gem.add_runtime_dependency 'linodeapi', '~> 1.0.0'
-  gem.add_runtime_dependency 'json', '~> 1.8.3'
-  gem.add_runtime_dependency 'log4r', '~> 1.1.10'
+  gem.add_runtime_dependency 'linodeapi', '~> 1.0'
+  gem.add_runtime_dependency 'log4r', '~> 1.1'
 
-  gem.add_development_dependency 'rake', '~> 10.4.2'
-  gem.add_development_dependency 'rspec', '~> 3.4.0'
-  gem.add_development_dependency 'aruba', '~> 0.12.0'
+  gem.add_development_dependency 'rake', '~> 12.0'
+  gem.add_development_dependency 'rspec', '~> 3.5'
+  gem.add_development_dependency 'aruba', '~> 0.14'
 
   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.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Marques Johansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linodeapi
@@ -17,84 +17,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.14'
 description: Enables Vagrant to manage Linode linodes
 email:
 - marques@linode.com