From a9248cb69792427b9921f5c4b5400ca01e66ebd6 Mon Sep 17 00:00:00 2001 From: Cam Cope Date: Tue, 18 Feb 2014 04:52:54 -0500 Subject: [PATCH] add backingstore parameters --- lib/vagrant-lxc/action/create.rb | 5 ++++- lib/vagrant-lxc/config.rb | 15 +++++++++++++++ lib/vagrant-lxc/driver.rb | 4 ++-- lib/vagrant-lxc/driver/cli.rb | 4 +++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/lib/vagrant-lxc/action/create.rb b/lib/vagrant-lxc/action/create.rb index 1676e21..c9d431a 100644 --- a/lib/vagrant-lxc/action/create.rb +++ b/lib/vagrant-lxc/action/create.rb @@ -7,7 +7,8 @@ module Vagrant end def call(env) - container_name = env[:machine].provider_config.container_name + config = env[:machine].provider_config + container_name = config.container_name case container_name when :machine @@ -24,6 +25,8 @@ module Vagrant env[:machine].provider.driver.create( container_name, + config.backingstore, + config.backingstore_options, env[:lxc_template_src], env[:lxc_template_config], env[:lxc_template_opts] diff --git a/lib/vagrant-lxc/config.rb b/lib/vagrant-lxc/config.rb index 1a47058..623d5d3 100644 --- a/lib/vagrant-lxc/config.rb +++ b/lib/vagrant-lxc/config.rb @@ -6,6 +6,12 @@ module Vagrant # @return [Array] attr_reader :customizations + # A string that contains the backing store type used with lxc-create -B + attr_accessor :backingstore + + # Optional arguments for the backing store, such as --fssize, --fstype, ... + attr_accessor :backingstore_options + # A String that points to a file that acts as a wrapper for sudo commands. # # This allows us to have a single entry when whitelisting NOPASSWD commands @@ -18,6 +24,8 @@ module Vagrant def initialize @customizations = [] + @backingstore = UNSET_VALUE + @backingstore_options = [] @sudo_wrapper = UNSET_VALUE @container_name = UNSET_VALUE end @@ -37,9 +45,16 @@ module Vagrant @customizations << [key, value] end + # Stores options for backingstores like lvm, btrfs, etc + def backingstore_option(key, value) + @backingstore_options << [key, value] + end + def finalize! @sudo_wrapper = nil if @sudo_wrapper == UNSET_VALUE @container_name = nil if @container_name == UNSET_VALUE + @backingstore = "none" if @backingstore == UNSET_VALUE + @existing_container_name = nil if @existing_container_name == UNSET_VALUE end def validate(machine) diff --git a/lib/vagrant-lxc/driver.rb b/lib/vagrant-lxc/driver.rb index 858b448..1b43632 100644 --- a/lib/vagrant-lxc/driver.rb +++ b/lib/vagrant-lxc/driver.rb @@ -51,12 +51,12 @@ module Vagrant @sudo_wrapper.run('cat', base_path.join('config').to_s) end - def create(name, template_path, config_file, template_options = {}) + def create(name, backingstore, backingstore_options, template_path, config_file, template_options = {}) @cli.name = @container_name = name import_template(template_path) do |template_name| @logger.debug "Creating container..." - @cli.create template_name, config_file, template_options + @cli.create template_name, backingstore, backingstore_options, config_file, template_options end end diff --git a/lib/vagrant-lxc/driver/cli.rb b/lib/vagrant-lxc/driver/cli.rb index f672bfd..d04a1d9 100644 --- a/lib/vagrant-lxc/driver/cli.rb +++ b/lib/vagrant-lxc/driver/cli.rb @@ -45,7 +45,7 @@ module Vagrant end end - def create(template, config_file, template_opts = {}) + def create(template, backingstore, backingstore_options, config_file, template_opts = {}) if config_file config_opts = ['-f', config_file] end @@ -54,6 +54,8 @@ module Vagrant extra.unshift '--' unless extra.empty? run :create, + '-B', backingstore, + *(backingstore_options.to_a.flatten), '--template', template, '--name', @name, *(config_opts),