vagrant-libcloud-helper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 521337bb97a99df321e636a28da41573a23f233c
-  data.tar.gz: 83f91feb8cff450f4a06b85d7b6235a3a59c60c5
+  metadata.gz: 24649215d1a47c716fd8e368983e0c885a3bdf33
+  data.tar.gz: c070a3203a8d8cf41073d08c7473535f87c4399e
 SHA512:
-  metadata.gz: 77178efe6e9d3953e111487f02f1daa617f78f44d45b35fcfc02f49e00153f2720b6e49be295f984f0f359b4717660edde4b5a5cbd269f2245044a36ff403c37
-  data.tar.gz: c4a8778c1cc0e4a44b0e835c649186128f6c5dcb1cb2c78125bdcc705986ebb494114fbb260c0cb2763db0b4189344a197c4f3e7bcd299a2aac669bf8d7a12c5
+  metadata.gz: 9d3a340a155b81f1f078c8883b7578b6517640369d3a18d73a57b09d94fe4da6f81ab5fd6a31ce7bd4fadd8e46d2b37bade9001b61d58e8388e8517296115f49
+  data.tar.gz: 4a0e8623e3896e1d8032c7f59932d00095a18b64fb9b09318d2a97bc9aca2c210f732fc0a74be3ccbeb8b60e67908ad9b61ad3c11a75ab65229b1889f4d54514

data/README.md

@@ -10,7 +10,9 @@ At the moment only VirtualBox instances are supported.
 boxes:
 
 * Allocate all SATA ports of the first SATA interface, so that disks may be
-  hot-plugged once the machine is up.
+  hot-plugged once the machine is up. If no SATA controller is found, one
+  will be created.
+
 
 ## Installation
 
@@ -26,19 +28,23 @@ If you want to use this plugin outside
 [libcloud-vagrant](https://github.com/carletes/libcloud-vagrant), you just
 need to enable the bits you want.
 
+### Allocation of SATA ports
+
 The following `Vagrantfile` snippet activates the allocation of all SATA
-ports:
+ports (A new SATA controller will be created if none is found):
 
 ```ruby
 Vagrant.configure("2") do |config|
 
   if Vagrant.has_plugin?("vagrant-libcloud-helper")
-    config.libcloud_helper.allocate_sata_ports = true
+    config.libcloud_helper.allocate_sata_ports = 30
   end
 
   # [..]
 end
 ```
+By default no SATA ports will be allocated.
+
 
 ## Compatibility
 
@@ -46,3 +52,22 @@ This plugin has been tested under 64-bit Linux with:
 
 * Vagrant 1.6.3
 * VirtualBox 4.3.14
+
+
+## Credits
+
+Most of the code here was taken from the
+[vagrant-persistent-storage](https://github.com/kusnier/vagrant-persistent-storage]) plugin.
+
+
+## Changes
+
+### Version 0.0.2
+
+* The config parameter `config.libcloud_helper.allocate_sata_ports` is now an
+  integer, representing the number of SATA ports to allocate.
+
+
+### Version 0.0.1
+
+* Initial release.

data/Vagrantfile

@@ -3,12 +3,17 @@
 
 Vagrant.configure("2") do |config|
 
-  # This plugin must be explicitly enabled. Do it like this:
-  config.libcloud_helper.allocate_sata_ports = true
-
   config.vm.define "precise64" do |n|
     n.vm.hostname = "precise64"
     n.vm.box = "hashicorp/precise64"
+
+    # The number of ports must be specified, since the default is 0
+    n.libcloud_helper.allocate_sata_ports = 30
+  end
+
+  config.vm.define "precise64-no-allocate" do |n|
+    n.vm.hostname = "precise64-no-allocate"
+    n.vm.box = "hashicorp/precise64"
   end
 
   # Test on a non-Linux box. This one, for instance, has no SATA adapter.
@@ -16,6 +21,8 @@ Vagrant.configure("2") do |config|
     n.vm.hostname = "openbsd55"
     n.vm.box = "tmatilai/openbsd-5.5"
 
+    n.libcloud_helper.allocate_sata_ports = 2
+
     # This Vagrant box does not boot when the host is behind an HTTP/FTPs
     # proxy, beacuse Vagrant tries to install the OpenBSD package ``rsync``
     # in order to implement rsync shared folders, which are the default.

data/lib/vagrant-libcloud-helper/action/allocate_sata_ports.rb

@@ -11,9 +11,10 @@ module VagrantPlugins
         def call(env)
           return @app.call(env) if @machine.state.id != :poweroff && [:up].include?(env[:machine_action])
 
-          if env[:machine].config.libcloud_helper.allocate_sata_ports
+          numports = env[:machine].config.libcloud_helper.allocate_sata_ports
+          if numports > 0
             env[:ui].info "Allocating SATA ports"
-            env[:machine].provider.driver.allocate_sata_ports
+            env[:machine].provider.driver.allocate_sata_ports numports
           end
 
           @app.call(env)

data/lib/vagrant-libcloud-helper/config.rb

@@ -11,7 +11,11 @@ module VagrantPlugins
       end
 
       def finalize!
-        @allocate_sata_ports = false if @allocate_sata_ports == UNSET_VALUE
+        if @allocate_sata_ports == UNSET_VALUE
+          @allocate_sata_ports = 0
+        else
+          @allocate_sata_ports = [@allocate_sata_ports, 30].min
+        end
       end
 
       def validate(machine)

data/lib/vagrant-libcloud-helper/providers/virtualbox/driver/base.rb

@@ -3,9 +3,8 @@ module VagrantPlugins
     module Driver
       class Base
 
-        def allocate_sata_ports
+        def allocate_sata_ports(portcount)
           controller = get_sata_controller_name
-          portcount = 30
           if controller.nil?
             controller = "SATA Controller"
             @logger.info("Creating SATA controller '#{controller}' with #{portcount} ports")

data/lib/vagrant-libcloud-helper/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module LibcloudHelper
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libcloud-helper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carlos Valiente
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: This plugins performs low-level changes to the life-cycle of Virtualbox guests