elecksee 1.0.8 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.0.10
+* Add clone support
+* Allow command passage to ephemeral nodes
+* Update temp directories to be world accessible/readable
+* Clean up and dry out some reusable bits
+
 ## v1.0.8
 * Delete overlay directories using `sudo`
 

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    elecksee (1.0.9)
+      mixlib-shellout
+      net-ssh
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mixlib-shellout (1.1.0)
+    net-ssh (2.6.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  elecksee!

data/README.md

@@ -1,47 +1,25 @@
 # Elecksee
 
-This is a simple library for interacting with LXC. It relies on
-LXC tools being installed on the system to properly function.
-It is extracted from the Chef LXC cookbook, so poke around there
+An LXC library for Ruby
 
 ## Usage
 
 ```ruby
-
 require 'elecksee/lxc'
 
-lxc = Lxc.new('my-container')
-p lxc.info
-```
-
-## Awesome
-
-Awesome ephemerals lets you create ephemeral nodes with different
-overlays for the rootfs. Since tmpfs will place a size restriction
-on ephemerals based on current memory available, this provides a
-simple workaround. Currently supported is a raw temporary directory
-on the host, or a VBD that defaults to 2GB.
-
-### Using temporary directory
-
-```
-$ lxc-awesome-ephemeral -o ubuntu -d -z /tmp/lxc-roots
+lxc = Lxc.new('container')
+lxc.start unless lxc.running?
 ```
 
-### Using VBD
-
-```
-$ lxc-awesome-ephemeral -o ubuntu -d -D 2000
-```
+## Included
 
-This will create a 2GB virtual block device for the container
-to use for the overlay.
+* Container inspect and interaction (`Lxc`)
+* Container cloning (`Lxc::Clone`)
+* Ephemeral containers (`Lxc::Ephemeral`)
 
-Note
-----
+### Notes
 
-Overlays are not persistent (thus ephemeral) and will be automatically
-cleaned up when the container has reached a stop state.
+This library is currently tested on ubuntu platforms >= 12.04
 
 # Info
 

data/lib/elecksee/clone.rb

@@ -1,15 +1,124 @@
-require 'elecksee/helpers'
-require 'elecksee/lxc'
+%w(
+  helpers/base helpers/options helpers/copies lxc
+  storage/overlay_directory storage/overlay_mount
+  storage/virtual_device
+).each do |path|
+  require "elecksee/#{path}"
+end
 
 class Lxc
   class Clone
 
-    
+    include Helpers
+    include Helpers::Options
+    include Helpers::Copies
+
+    option :original, '-o', :string, :required => true, :desc => 'Original container name', :aliases => 'orig'
+    option :new_name, '-n', :string, :required => true, :desc => 'New container name', :aliases => 'new'
+    option :snapshot, '-s', :boolean, :desc => 'Make new rootfs a snapshot of original'
+    option :fssize, '-L', :string, :desc => 'Size of new file system', :default => '2G'
+    option :vgname, '-v', :string, :desc => 'LVM volume group name', :default => 'lxc'
+    option :lvprefix, '-p', :string, :desc => 'LVM volume name prefix'
+    option :fstype, '-t', :string, :desc => 'New container file system', :default => 'ext4'
+    option :device, '-D', :integer, :desc => 'Make copy in VBD of {SIZE}M'
+    option :ipaddress, '-I', :string, :desc => 'Custom IP address'
+    option :gateway, '-G', :string, :desc => 'Custom gateway'
+    option :netmask, '-N', :string, :default => '255.255.255.0', :desc => 'Custom netmask'
+
+    # Hash containing original and new container instances
+    attr_reader :lxcs
+
     def initialize(args={})
-      args = Mash.new(args)
-      %w(original new_name).each do |key|
-        raise ArgumentError.new "Missing required parameter: #{key}" unless args[key]
+      configure!(args)
+      @lxcs = {}
+      @lxcs[:original] = Lxc.new(original)
+      @lxcs[:new] = Lxc.new(new_name)
+      @created = []
+      validate!
+    end
+
+    def clone!
+      begin
+        copy_original
+        update_naming(:no_config)
+        apply_custom_addressing if ipaddress
+        lxcs[:new]
+      rescue Exception
+        @created.map(&:destroy)
+        raise
+      end
+    end
+    
+    private
+
+    alias_method :name, :new_name
+    
+    # Returns new lxc instance
+    def lxc
+      lxcs[:new]
+    end
+
+    def created(thing)
+      @created << thing
+    end
+
+    def validate!
+      unless(lxcs[:original].exists?)
+        raise "Requested `original` container does not exist (#{original})"
       end
+      if(lxcs[:new].exists?)
+        raise "Requested `new` container already exists (#{new_name})"
+      end
+      if(lxcs[:original].running?)
+        raise "Requested `original` container is current running (#{original})"
+      end
+    end
+
+    def copy_original
+      copy_init
+      if(device)
+        rootfs_dir = copy_vbd
+      elsif(File.stat(lxcs[:original].path.to_s).blockdev?)
+        rootfs_dir = copy_lvm
+      elsif(command("btrfs subvolume list '#{lxcs[:original].path}'", :allow_failure => true))
+        rootfs_dir = copy_btrfs
+      else
+        rootfs_dir = copy_fs
+      end
+      update_rootfs(rootfs_dir)
+    end
+
+    def copy_init
+      directory = CloneDirectory.new(lxcs[:new].name, :dir => File.dirname(lxcs[:original].path.to_s))
+      created(directory)
+      %w(config fstab).each do |file|
+        command("cp '#{lxcs[:original].path.join(file)}' '#{directory.target_path}'", :sudo => true)
+      end
+    end
+
+    def copy_fs
+      directory = CloneDirectory.new(lxcs[:new].name, :dir => File.dirname(lxcs[:original].path.to_s))
+      created(directory)
+      command("rsync -ax '#{lxcs[:original].rootfs}/' '#{File.join(directory.target_path, 'rootfs')}/'", :sudo => true)
+      File.join(directory.target_path, 'rootfs')
+    end
+
+    def copy_vbd
+      storage = VirtualDevice.new(lxcs[:new].name, :tmp_dir => '/opt/lxc-vbd')
+      created(storage)
+      command("rsync -ax '#{lxcs[:original].rootfs}/' '#{storage.target_path}/'", :sudo => true)
+      storage.target_path
+    end
+
+    def copy_lvm
+      raise 'Not implemented'
+    end
+
+    def copy_btrfs
+      rootfs_path = lxcs[:new].path.join('rootfs')
+      command("btrfs subvolume snapshot '#{lxcs[:original].rootfs}' '#{rootfs_path}'", :sudo => true)
+      # TODO: Remove on failure
+      rootfs_path
     end
   end
 end

data/lib/elecksee/ephemeral.rb

@@ -4,8 +4,9 @@ require 'tmpdir'
 require 'etc'
 
 %w(
-  helpers lxc storage/overlay_directory
-  storage/overlay_mount storage/virtual_device
+  helpers/base helpers/options helpers/copies lxc
+  storage/overlay_directory storage/overlay_mount
+  storage/virtual_device
 ).each do |path|
   require "elecksee/#{path}"
 end
@@ -15,26 +16,8 @@ class Lxc
   class Ephemeral
 
     include Helpers
-
-    NAME_FILES = %w(fstab config)
-    HOSTNAME_FILES = %w(
-      rootfs/etc/hostname
-      rootfs/etc/hosts
-      rootfs/etc/sysconfig/network
-      rootfs/etc/sysconfig/network-scripts/ifcfg-eth0
-    )
-    
-    class << self
-      attr_reader :options
-      
-      def option(name, short, type, args={})
-        @options ||= {}
-        @options[name] = args.merge(:short => short, :type => type)
-        instance_eval do
-          attr_accessor name.to_sym
-        end
-      end
-    end
+    include Helpers::Options
+    include Helpers::Copies
 
     option :original, '-o', :string, :required => true, :desc => 'Original container name'
     option :ipaddress, '-I', :string, :desc => 'Custom IP address'
@@ -49,6 +32,7 @@ class Lxc
     option :ssh_key, '-S', :string, :default => '/opt/hw-lxc-config/id_rsa', :aliases => 'ssh-key', :desc => 'Deprecated: Provided for compatibility'
     option :lxc_dir, '-L', :string, :default => '/var/lib/lxc', :aliases => 'lxc-dir', :desc => 'Directory of LXC store'
     option :tmp_dir, '-T', :string, :default => '/tmp/lxc/ephemerals', :aliases => 'tmp-dir', :desc => 'Directory of ephemeral temp files'
+    option :ephemeral_command, '-C', :string, :aliases => 'command'
 
     attr_reader :name
     attr_reader :cli
@@ -63,6 +47,7 @@ class Lxc
       configure!(args)
       @cli = args[:cli]
       @path = command("mktemp -d -p #{lxc_dir} #{original}-XXXXXXXXXXXX", :sudo => true).stdout.strip
+      command("chmod 0755 #{@path}", :sudo => true)
       @name = File.basename(@path)
       @hostname = @name.gsub(%r{[^A-Za-z0-9\-]}, '')
       @ephemeral_binds = []
@@ -81,6 +66,21 @@ class Lxc
         puts "    - Connect using: sudo ssh -i #{ssh_key} root@#{lxc.container_ip(10)}"
       end
     end
+
+    def start_action
+      begin
+        lxc.start
+        if(ephemeral_command)
+          lxc.container_command(ephemeral_command)
+        else
+          cli_output
+          lxc.wait_for_state(:stopped)
+        end
+      ensure
+        cleanup
+      end
+      true
+    end
     
     def start!(*args)
       register_traps
@@ -88,23 +88,14 @@ class Lxc
       if(daemon)
         if(args.include?(:fork))
           fork do
-            lxc.start
-            cli_output
-            lxc.wait_for_state(:stopped)
-            cleanup
+            start_action
           end
         else
           Process.daemon
-          lxc.start
-          cli_output
-          lxc.wait_for_state(:stopped)
-          cleanup
+          start_action
         end
       else
-        lxc.start
-        cli_output
-        lxc.wait_for_state(:stopped)
-        cleanup
+        start_action
       end
     end
 
@@ -123,39 +114,7 @@ class Lxc
     end
 
     private
-
-    def configure!(args)
-      self.class.options.each do |name, opts|
-        argv = args.detect{|k,v| (Array(opts[:aliases]) + Array(opts[:short]) + [name]).include?(k.to_sym)}
-        argv = argv.last if argv
-        argv ||= opts[:default]
-        if(argv)
-          check_type!(name, argv, opts[:type])
-          self.send("#{name}=", argv)
-        else
-          if(opts[:required])
-            raise ArgumentError.new "Missing required argument: #{name}"
-          end
-        end
-      end
-      if(ipaddress && gateway.nil?)
-        self.gateway = ipaddress.sub(%r{\d+$}, '1')
-      end
-    end
-
-    def check_type!(arg_name, val, type)
-      valid = false
-      case type
-      when :string
-        valid = val.is_a?(String)
-      when :boolean
-        valid = val.is_a?(TrueClass) || val.is_a?(FalseClass)
-      when :integer
-        valid = val.is_a?(Numeric)
-      end
-      raise ArgumentError.new "Invalid type provided for #{arg_name}. Expecting value type of: #{type.inspect} Got: #{val.class} -  #{val}" unless valid
-    end
-
+    
     def setup
       create
       build_overlay
@@ -174,137 +133,50 @@ class Lxc
       @ephemeral_overlay = OverlayMount.new(
         :base => Lxc.new(original).rootfs.to_path,
         :overlay => ephemeral_device.target_path,
-        :target => lxc.rootfs.to_path,
+        :target => lxc.path.join('rootfs').to_path,
         :overlay_type => union
       )
       @ephemeral_overlay.mount
     end
-
-    def writable_path!(path)
-      unless(File.directory?(File.dirname(path)))
-        command("mkdir -p #{File.dirname(path)}", :sudo => true)
-      end
-      unless(File.exists?(path))
-        command("touch #{path}", :sudo => true)
-      end
-      command("chown #{Etc.getlogin} #{path}", :sudo => true)
-    end
     
     def create
       Dir.glob(File.join(lxc_dir, original, '*')).each do |o_path|
         next unless File.file?(o_path)
         command("cp #{o_path} #{File.join(path, File.basename(o_path))}", :sudo => true)
       end
-      command("chown -R #{Etc.getlogin} #{path}", :sudo => true)
       @lxc = Lxc.new(name)
-      Dir.mkdir(lxc.rootfs.to_path)
-      contents = File.readlines(lxc.config)
-      File.open(lxc.config, 'w') do |file|
-        contents.each do |line|
-          if(line.strip.start_with?('lxc.network.hwaddr'))
-            file.write "00:16:3e#{SecureRandom.hex(3).gsub(/(..)/, ':\1')}"
-          else
-            file.write line
-          end
-        end
-      end
+      command("mkdir -p '#{lxc.path.join('rootfs')}'", :sudo => true)
+      update_net_hwaddr
     end
 
     # TODO: Discovered binds for ephemeral are all tmpfs for now.
+    # TODO: We should default to overlay mount, make virt dev optional
     def discover_binds
-      contents = File.readlines(lxc.path.join('fstab'))
-      File.open(lxc.path.join('fstab'), 'w') do |file|
-        contents.each do |line|
-          parts = line.split(' ')
-          if(parts[3] == 'bind')
-            source = parts.first
-            target = parts[1].sub(%r{^.+rootfs/}, '')
-            container_target = lxc.rootfs.join(target).to_path
-            device = VirtualDevice.new(target.gsub('/', '_'), :tmp_fs => true)
-            device.mount
-            FileUtils.mkdir_p(container_target)
-            ephemeral_binds << device
-            if(union == 'overlayfs')
-              file.write "none #{container_target} overlayfs upperdir=#{device.mount_path},lowerdir=#{source} 0 0"
-            else
-              file.write "none #{container_target} aufs br=#{device.mount_path}=rw:#{source}=ro,noplink 0 0"
-            end
+      contents = File.readlines(lxc.path.join('fstab')).each do |line|
+        parts = line.split(' ')
+        if(parts[3] == 'bind')
+          source = parts.first
+          target = parts[1].sub(%r{^.+rootfs/}, '')
+          container_target = lxc.rootfs.join(target).to_path
+          device = VirtualDevice.new(target.gsub('/', '_'), :tmp_fs => true)
+          device.mount
+          FileUtils.mkdir_p(container_target)
+          ephemeral_binds << device
+          if(union == 'overlayfs')
+            "none #{container_target} overlayfs upperdir=#{device.mount_path},lowerdir=#{source} 0 0"
           else
-            file.write line
+            "none #{container_target} aufs br=#{device.mount_path}=rw:#{source}=ro,noplink 0 0"
           end
-        end
-        # If bind option used, bind in for rw
-        if(bind)
-          command("mkdir -p #{lxc.rootfs.join(bind).to_path}", :sudo => true)
-          file.puts "#{bind} #{lxc.rootfs.join(bind)} none bind 0 0"
-        end
-      end
-    end
-    
-    def update_naming
-      NAME_FILES.each do |file|
-        next unless File.exists?(lxc.path.join(file))
-        writable_path!(lxc.path.join(file).to_path)
-        contents = File.read(lxc.path.join(file))
-        File.open(lxc.path.join(file), 'w') do |new_file|
-          new_file.write contents.gsub(original, name)
-        end
-      end
-      HOSTNAME_FILES.each do |file|
-        next unless File.exists?(lxc.path.join(file))
-        writable_path!(lxc.path.join(file).to_path)
-        contents = File.read(lxc.path.join(file))
-        File.open(lxc.path.join(file), 'w') do |new_file|
-          new_file.write contents.gsub(original, hostname)
+        else
+          line
         end
       end
-    end
-
-    def el_platform?
-      lxc.rootfs.join('etc/redhat-release').exist?
-    end
-    
-    def apply_custom_networking
-      if(el_platform?)
-        writable_path!(path = lxc.rootfs.join('etc/sysconfig/network-scripts/ifcfg-eth0'))
-        File.open(path, 'w') do |file|
-          file.write <<-EOF
-DEVICE=eth0
-BOOTPROTO=static
-NETMASK=#{netmask}
-IPADDR=#{ipaddress}
-ONBOOT=yes
-TYPE=Ethernet
-USERCTL=yes
-PEERDNS=yes
-IPV6INIT=no
-GATEWAY=#{gateway}
-EOF
-        end
-        writable_path!(path = lxc.rootfs.join('etc/sysconfig/network'))
-        File.open(path, 'w') do |file|
-          file.write <<-EOF
-NETWORKING=yes
-HOSTNAME=#{hostname}
-EOF
-        end
-        File.open(@lxc.rootfs.join('etc/rc.local'), 'w') do |file|
-          file.puts "hostname #{hostname}"
-        end
-      else
-        writable_path!(path = lxc.rootfs.join('etc/network/interfaces'))
-        File.open(path, 'w') do |file|
-          file.write <<-EOF
-auto lo
-iface lo inet loopback
-auto eth0
-iface eth0 inet static
-address #{ipaddress}
-netmask #{netmask}
-gateway #{gateway}
-EOF
-        end
+      # If bind option used, bind in for rw
+      if(bind)
+        command("mkdir -p #{lxc.rootfs.join(bind).to_path}", :sudo => true)
+        contents << "#{bind} #{lxc.rootfs.join(bind)} none bind 0 0\n"
       end
+      write_file(lxc.path.join('fstab'), contents.join)
     end
   end
 end

data/lib/elecksee/{helpers.rb → helpers/base.rb}

@@ -1,9 +1,9 @@
 class Lxc
   class CommandFailed < StandardError
   end
-  
-  module Helpers
 
+  module Helpers
+  
     def sudo
       Lxc.sudo
     end
@@ -14,7 +14,7 @@ class Lxc
       cmd = [sudo, cmd].join(' ') if args[:sudo]
       begin
         shlout = Mixlib::ShellOut.new(cmd, 
-          :logger => defined?(Chef) ? Chef::Log.logger : log,
+          :logger => defined?(Chef) && defined?(Chef::Log) ? Chef::Log.logger : log,
           :live_stream => args[:livestream] ? STDOUT : nil,
           :timeout => args[:timeout] || 1200,
           :environment => {'HOME' => detect_home}
@@ -30,7 +30,7 @@ class Lxc
           retries -= 1
           retry
         elsif(args[:allow_failure])
-          true
+          false
         else
           raise
         end

data/lib/elecksee/helpers/copies.rb

@@ -0,0 +1,106 @@
+require 'tempfile'
+
+class Lxc
+  module Helpers
+    module Copies
+
+      NAME_FILES = %w(fstab config)
+      HOSTNAME_FILES = %w(
+        rootfs/etc/hostname
+        rootfs/etc/hosts
+        rootfs/etc/sysconfig/network
+        rootfs/etc/sysconfig/network-scripts/ifcfg-eth0
+      )
+      
+      def update_rootfs(rootfs_path)
+        contents = File.readlines(lxc.config.to_s).map do |line|
+          if(line.start_with?('lxc.rootfs'))
+            "lxc.rootfs = #{rootfs_path}\n"
+          else
+            line
+          end
+        end.join
+        write_file(lxc.config, contents)
+      end
+
+      def update_net_hwaddr
+        contents = File.readlines(lxc.config).map do |line|
+          if(line.start_with?('lxc.network.hwaddr'))
+            parts = line.split('=')
+            "#{parts.first.strip} = 00:16:3e#{SecureRandom.hex(3).gsub(/(..)/, ':\1')}\n"
+          else
+            line
+          end
+        end.join
+        write_file(lxc.config, contents)
+      end
+
+      def write_file(path, contents)
+        contents = contents.join if contents.is_a?(Array)
+        tmp = Tempfile.new('lxc-copy')
+        tmp.write(contents)
+        tmp.close
+        command("cp #{tmp.path} #{path}", :sudo => true)
+        tmp.unlink
+        command("chmod 0644 #{path}", :sudo => true)
+      end
+      
+      def update_naming(*args)
+        NAME_FILES.each do |file|
+          next unless File.exists?(lxc.path.join(file))
+          next if args.include?("no_#{file}".to_sym)
+          contents = File.read(lxc.path.join(file)).gsub(original, name)
+          write_file(lxc.path.join(file), contents)
+        end
+        HOSTNAME_FILES.each do |file|
+          next unless File.exists?(lxc.path.join(file))
+          next if args.include?("no_#{file}".to_sym)
+          contents = File.read(lxc.path.join(file)).gsub(original, name)
+          write_file(lxc.path.join(file), contents)
+        end
+      end
+
+      def el_platform?
+        lxc.rootfs.join('etc/redhat-release').exist?
+      end
+      
+      def apply_custom_networking
+        if(el_platform?)
+          path = lxc.rootfs.join('etc/sysconfig/network-scripts/ifcfg-eth0')
+          content = <<-EOF
+DEVICE=eth0
+BOOTPROTO=static
+NETMASK=#{netmask}
+IPADDR=#{ipaddress}
+ONBOOT=yes
+TYPE=Ethernet
+USERCTL=yes
+PEERDNS=yes
+IPV6INIT=no
+GATEWAY=#{gateway}
+EOF
+          write_file(path, content)
+          path = lxc.rootfs.join('etc/sysconfig/network')
+          content = <<-EOF
+NETWORKING=yes
+HOSTNAME=#{hostname}
+EOF
+          write_file(path, content)
+          write_file(lxc.rootfs.join('etc/rc.local'), "hostname #{hostname}\n")
+        else
+          path = lxc.rootfs.join('etc/network/interfaces')
+          content = <<-EOF
+auto lo
+iface lo inet loopback
+auto eth0
+iface eth0 inet static
+address #{ipaddress}
+netmask #{netmask}
+gateway #{gateway}
+EOF
+          write_file(path, content)
+        end
+      end
+    end
+  end
+end

data/lib/elecksee/helpers/options.rb

@@ -0,0 +1,58 @@
+class Lxc
+  module Helpers
+
+    module Options
+      class << self
+        def included(klass)
+          klass.class_eval do
+            class << self
+              attr_reader :options
+              
+              def option(name, short, type, args={})
+                @options ||= {}
+                @options[name] = args.merge(:short => short, :type => type)
+                instance_eval do
+                  attr_accessor name.to_sym
+                end
+              end
+            end
+          end
+        end
+      end
+
+      private
+
+      def configure!(args)
+        self.class.options.each do |name, opts|
+          argv = args.detect{|k,v| (Array(opts[:aliases]) + Array(opts[:short]) + [name]).include?(k.to_sym)}
+          argv = argv.last if argv
+          argv ||= opts[:default]
+          if(argv)
+            check_type!(name, argv, opts[:type])
+            self.send("#{name}=", argv)
+          else
+            if(opts[:required])
+              raise ArgumentError.new "Missing required argument: #{name}"
+            end
+          end
+        end
+        if(ipaddress && gateway.nil?)
+          self.gateway = ipaddress.sub(%r{\d+$}, '1')
+        end
+      end
+
+      def check_type!(arg_name, val, type)
+        valid = false
+        case type
+        when :string
+          valid = val.is_a?(String)
+        when :boolean
+          valid = val.is_a?(TrueClass) || val.is_a?(FalseClass)
+        when :integer
+          valid = val.is_a?(Numeric)
+        end
+        raise ArgumentError.new "Invalid type provided for #{arg_name}. Expecting value type of: #{type.inspect} Got: #{val.class} -  #{val}" unless valid
+      end
+    end
+  end
+end

data/lib/elecksee/lxc.rb

@@ -1,4 +1,4 @@
-require 'elecksee/helpers'
+require 'elecksee/helpers/base'
 require 'mixlib/shellout'
 require 'pathname'
 require 'tmpdir'
@@ -245,7 +245,12 @@ class Lxc
   alias_method :config, :container_config
 
   def container_rootfs
-    container_path.join('rootfs')
+    if(File.exists?(config))
+      r_path = File.readlines(config).detect do |line|
+        line.start_with?('lxc.rootfs')
+      end.to_s.split('=').last.to_s.strip
+    end
+    r_path.to_s.empty? ? container_path.join('rootfs') : Pathname.new(r_path)
   end
   alias_method :rootfs, :container_rootfs
 

data/lib/elecksee/storage/overlay_directory.rb

@@ -1,4 +1,4 @@
-require 'elecksee/helpers'
+require 'elecksee/helpers/base'
 
 class Lxc
   class OverlayDirectory
@@ -32,4 +32,19 @@ class Lxc
     end
     
   end
+
+  # Clone directory does the same as the overlay, just in
+  # a persistent place
+  class CloneDirectory < OverlayDirectory
+    def initialize(name, args={})
+      args[:tmp_dir] = args[:dir] if args[:dir]
+      args[:tmp_dir] || '/var/lib/lxc'
+      super
+    end
+
+    def overlay_path
+      File.join(tmp_dir, name)
+    end
+    alias_method :target_path, :overlay_path
+  end
 end

data/lib/elecksee/storage/overlay_mount.rb

@@ -1,4 +1,4 @@
-require 'elecksee/helpers'
+require 'elecksee/helpers/base'
 
 class Lxc
   class OverlayMount

data/lib/elecksee/storage/virtual_device.rb

@@ -1,4 +1,4 @@
-require 'elecksee/helpers'
+require 'elecksee/helpers/base'
 
 class Lxc
   

data/lib/elecksee/version.rb

@@ -2,5 +2,5 @@ module Elecksee
   class Version < Gem::Version
   end
 
-  VERSION = Version.new('1.0.8')
+  VERSION = Version.new('1.0.10')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elecksee
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -54,7 +54,9 @@ files:
 - lib/elecksee/clone.rb
 - lib/elecksee/version.rb
 - lib/elecksee/lxc_file_config.rb
-- lib/elecksee/helpers.rb
+- lib/elecksee/helpers/copies.rb
+- lib/elecksee/helpers/options.rb
+- lib/elecksee/helpers/base.rb
 - lib/elecksee/storage/overlay_mount.rb
 - lib/elecksee/storage/virtual_device.rb
 - lib/elecksee/storage/overlay_directory.rb
@@ -65,8 +67,8 @@ files:
 - README.md
 - LICENSE
 - bin/lxc-awesome-ephemeral
-- elecksee-1.0.8.gem
 - CHANGELOG.md
+- Gemfile.lock
 homepage: http://github.com/chrisroberts/elecksee
 licenses: []
 post_install_message: